Redo #23418 (#23425)

* Check for provider values inside check_args of respective network code

* Partial revert of b9ee5aa

The no_log change is okay, but take out the action result munging

lib/ansible/plugins/action/dellos10.py

@@ -93,12 +93,6 @@ class ActionModule(_ActionModule):
             self._play_context.become_method = None
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):

lib/ansible/plugins/action/dellos6.py

@@ -89,12 +89,6 @@ class ActionModule(_ActionModule):
             self._play_context.become_method = None
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):

lib/ansible/plugins/action/dellos9.py

@@ -93,12 +93,6 @@ class ActionModule(_ActionModule):
             self._play_context.become_method = None
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):

lib/ansible/plugins/action/eos.py

@@ -118,12 +118,6 @@ class ActionModule(_ActionModule):
             self._task.args['provider'] = provider
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):

lib/ansible/plugins/action/ios.py

@@ -88,12 +88,6 @@ class ActionModule(_ActionModule):
             self._play_context.become_method = None
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):

lib/ansible/plugins/action/iosxr.py

@@ -83,12 +83,6 @@ class ActionModule(_ActionModule):
         task_vars['ansible_socket'] = socket_path
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):

lib/ansible/plugins/action/junos.py

@@ -103,12 +103,6 @@ class ActionModule(_ActionModule):
         task_vars['ansible_socket'] = socket_path
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):

lib/ansible/plugins/action/nxos.py

@@ -120,12 +120,6 @@ class ActionModule(_ActionModule):
         self._task.args['transport'] = transport
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):
@@ -160,5 +154,3 @@ class ActionModule(_ActionModule):
             return strategy(*args, **kwargs)
         except AnsibleFallbackNotFound:
             pass
-
-

lib/ansible/plugins/action/sros.py

@@ -79,12 +79,6 @@ class ActionModule(_ActionModule):
         task_vars['ansible_socket'] = socket_path
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):

lib/ansible/plugins/action/vyos.py

@@ -81,12 +81,6 @@ class ActionModule(_ActionModule):
         task_vars['ansible_socket'] = socket_path
 
         result = super(ActionModule, self).run(tmp, task_vars)
-
-        try:
-            del result['invocation']['module_args']['provider']
-        except KeyError:
-            pass
-
         return result
 
     def _get_socket_path(self, play_context):