From 9fb9c00092c240774699a316ed21467d449f7009 Mon Sep 17 00:00:00 2001 From: Trishna Guha Date: Mon, 22 May 2017 20:02:36 +0530 Subject: [PATCH] Remove deprecation for username/password eos_user, nxos_user and Doc update (#24880) Signed-off-by: Trishna Guha --- lib/ansible/module_utils/eos.py | 12 +++++++++--- lib/ansible/module_utils/nxos.py | 8 ++++++-- lib/ansible/modules/network/eos/eos_user.py | 1 + 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/ansible/module_utils/eos.py b/lib/ansible/module_utils/eos.py index 242d85c42c..bfbdd04767 100644 --- a/lib/ansible/module_utils/eos.py +++ b/lib/ansible/module_utils/eos.py @@ -67,9 +67,15 @@ ARGS_DEFAULT_VALUE = { def check_args(module, warnings): provider = module.params['provider'] or {} for key in eos_argument_spec: - if key not in ['provider', 'transport', 'authorize'] and module.params[key]: - warnings.append('argument %s has been deprecated and will be ' - 'removed in a future version' % key) + if module._name == 'eos_user': + if (key not in ['username', 'password', 'provider', 'transport', 'authorize'] and + module.params[key]): + warnings.append('argument %s has been deprecated and will be ' + 'removed in a future version' % key) + else: + if key not in ['provider', 'authorize'] and module.params[key]: + warnings.append('argument %s has been deprecated and will be ' + 'removed in a future version' % key) # set argument's default value if not provided in input # This is done to avoid unwanted argument deprecation warning diff --git a/lib/ansible/module_utils/nxos.py b/lib/ansible/module_utils/nxos.py index 19793ea777..fce1e8eba9 100644 --- a/lib/ansible/module_utils/nxos.py +++ b/lib/ansible/module_utils/nxos.py @@ -65,8 +65,12 @@ ARGS_DEFAULT_VALUE = { def check_args(module, warnings): provider = module.params['provider'] or {} for key in nxos_argument_spec: - if key not in ['provider', 'transport'] and module.params[key]: - warnings.append('argument %s has been deprecated and will be removed in a future version' % key) + if module._name == 'nxos_user': + if key not in ['password', 'provider', 'transport'] and module.params[key]: + warnings.append('argument %s has been deprecated and will be in a future version' % key) + else: + if key not in ['provider', 'transport'] and module.params[key]: + warnings.append('argument %s has been deprecated and will be removed in a future version' % key) # set argument's default value if not provided in input # This is done to avoid unwanted argument deprecation warning diff --git a/lib/ansible/modules/network/eos/eos_user.py b/lib/ansible/modules/network/eos/eos_user.py index e91935193a..51f9f454bc 100644 --- a/lib/ansible/modules/network/eos/eos_user.py +++ b/lib/ansible/modules/network/eos/eos_user.py @@ -46,6 +46,7 @@ options: - The username to be configured on the remote Arista EOS device. This argument accepts a stringv value and is mutually exclusive with the C(users) argument. + Please note that this option is not same as C(provider username). update_password: description: - Since passwords are encrypted in the device running config, this