Fixes ansible#23388 Network provider masks too much (ansible#23418)

* Fixes ansible#23388 Network provider masks too much * Fix trailing whitespace
rajasaur · Apr 7, 2017 · d4bd54d · d4bd54d
1 parent 0cf1e8e
commit d4bd54d
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 13 deletions.
diff --git a/lib/ansible/module_utils/eos.py b/lib/ansible/module_utils/eos.py
@@ -53,7 +53,7 @@
     'validate_certs': dict(type='bool', default=True),
     'timeout': dict(type='int'),
 
-    'provider': dict(type='dict', no_log=True),
+    'provider': dict(type='dict'),
     'transport': dict(choices=['cli', 'eapi'])
 }
 

diff --git a/lib/ansible/module_utils/ios.py b/lib/ansible/module_utils/ios.py
@@ -40,7 +40,7 @@
     'authorize': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
     'auth_pass': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS']), no_log=True),
     'timeout': dict(type='int'),
-    'provider': dict(type='dict', no_log=True),
+    'provider': dict(type='dict'),
 }
 
 def check_args(module, warnings):

diff --git a/lib/ansible/module_utils/iosxr.py b/lib/ansible/module_utils/iosxr.py
@@ -39,7 +39,7 @@
     'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
     'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
     'timeout': dict(type='int'),
-    'provider': dict(type='dict', no_log=True)
+    'provider': dict(type='dict')
 }
 
 def check_args(module, warnings):

diff --git a/lib/ansible/module_utils/junos.py b/lib/ansible/module_utils/junos.py
@@ -37,7 +37,7 @@
     'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
     'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
     'timeout': dict(type='int', default=10),
-    'provider': dict(type='dict', no_log=True),
+    'provider': dict(type='dict'),
     'transport': dict()
 }
 

diff --git a/lib/ansible/module_utils/vyos.py b/lib/ansible/module_utils/vyos.py
@@ -40,7 +40,7 @@
     'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
 
     'timeout': dict(type='int'),
-    'provider': dict(type='dict', no_log=True),
+    'provider': dict(type='dict'),
 }
 
 def check_args(module, warnings):

diff --git a/lib/ansible/plugins/action/dellos10.py b/lib/ansible/plugins/action/dellos10.py
@@ -92,7 +92,14 @@ def run(self, tmp=None, task_vars=None):
             self._play_context.become = False
             self._play_context.become_method = None
 
-        return super(ActionModule, self).run(tmp, task_vars)
+        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):
         ssh = connection_loader.get('ssh', class_only=True)

diff --git a/lib/ansible/plugins/action/dellos6.py b/lib/ansible/plugins/action/dellos6.py
@@ -87,7 +87,15 @@ def run(self, tmp=None, task_vars=None):
         if self._play_context.become_method == 'enable':
             self._play_context.become = False
             self._play_context.become_method = None
-        return super(ActionModule, self).run(tmp, task_vars)
+
+        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):
         ssh = connection_loader.get('ssh', class_only=True)

diff --git a/lib/ansible/plugins/action/dellos9.py b/lib/ansible/plugins/action/dellos9.py
@@ -92,7 +92,14 @@ def run(self, tmp=None, task_vars=None):
             self._play_context.become = False
             self._play_context.become_method = None
 
-        return super(ActionModule, self).run(tmp, task_vars)
+        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):
         ssh = connection_loader.get('ssh', class_only=True)

diff --git a/lib/ansible/plugins/action/eos.py b/lib/ansible/plugins/action/eos.py
@@ -117,7 +117,14 @@ def run(self, tmp=None, task_vars=None):
 
             self._task.args['provider'] = provider
 
-        return super(ActionModule, self).run(tmp, task_vars)
+        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):
         ssh = connection_loader.get('ssh', class_only=True)

diff --git a/lib/ansible/plugins/action/ios.py b/lib/ansible/plugins/action/ios.py
@@ -87,7 +87,14 @@ def run(self, tmp=None, task_vars=None):
             self._play_context.become = False
             self._play_context.become_method = None
 
-        return super(ActionModule, self).run(tmp, task_vars)
+        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):
         ssh = connection_loader.get('ssh', class_only=True)

diff --git a/lib/ansible/plugins/action/iosxr.py b/lib/ansible/plugins/action/iosxr.py
@@ -84,6 +84,11 @@ def run(self, tmp=None, task_vars=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):

diff --git a/lib/ansible/plugins/action/junos.py b/lib/ansible/plugins/action/junos.py
@@ -102,7 +102,14 @@ def run(self, tmp=None, task_vars=None):
 
         task_vars['ansible_socket'] = socket_path
 
-        return super(ActionModule, self).run(tmp, task_vars)
+        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):
         ssh = connection_loader.get('ssh', class_only=True)

diff --git a/lib/ansible/plugins/action/sros.py b/lib/ansible/plugins/action/sros.py
@@ -78,7 +78,14 @@ def run(self, tmp=None, task_vars=None):
 
         task_vars['ansible_socket'] = socket_path
 
-        return super(ActionModule, self).run(tmp, task_vars)
+        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):
         ssh = connection_loader.get('ssh', class_only=True)

diff --git a/lib/ansible/plugins/action/vyos.py b/lib/ansible/plugins/action/vyos.py
@@ -80,7 +80,14 @@ def run(self, tmp=None, task_vars=None):
 
         task_vars['ansible_socket'] = socket_path
 
-        return super(ActionModule, self).run(tmp, task_vars)
+        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):
         ssh = connection_loader.get('ssh', class_only=True)