Remove deprecation for username/password eos_user, nxos_user and Doc update (#24880) (#24893)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 9fb9c00092)

lib/ansible/module_utils/eos.py

@@ -67,7 +67,13 @@ 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]:
+        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)
 

lib/ansible/module_utils/nxos.py

@@ -63,9 +63,12 @@ ARGS_DEFAULT_VALUE = {
 def check_args(module, warnings):
     provider = module.params['provider'] or {}
     for key in nxos_argument_spec:
+        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 '
+                warnings.append('argument %s has been deprecated and will be removed in a future version' % key)
-                    '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

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