Merge pull request #70 from napalm-automation/develop

Release

.gitignore

@@ -60,4 +60,4 @@ env
 tags
 *.swp
 
-.compiled
+.compiled

library/napalm_get_facts.py

@@ -158,7 +158,7 @@ def main():
             hostname=dict(type='str', required=False, aliases=['host']),
             username=dict(type='str', required=False),
             password=dict(type='str', required=False, no_log=True),
-            provider=dict(type='dict', required=False, no_log=True),
+            provider=dict(type='dict', required=False),
             dev_os=dict(type='str', required=False, choices=os_choices),
             timeout=dict(type='int', required=False, default=60),
             ignore_notimplemented=dict(type='bool', required=False, default=False),
@@ -175,6 +175,15 @@ def main():
 
     provider = module.params['provider'] or {}
 
+    no_log = ['password', 'secret']
+    for param in no_log:
+        if provider.get(param):
+            module.no_log_values.update(return_values(provider[param]))
+        if provider.get('optional_args') and provider['optional_args'].get(param):
+            module.no_log_values.update(return_values(provider['optional_args'].get(param)))
+        if module.params.get('optional_args') and module.params['optional_args'].get(param):
+            module.no_log_values.update(return_values(module.params['optional_args'].get(param)))
+
     # allow host or hostname
     provider['hostname'] = provider.get('hostname', None) or provider.get('host', None)
     # allow local params to override provider

library/napalm_install_config.py

@@ -180,7 +180,7 @@ def main():
             hostname=dict(type='str', required=False, aliases=['host']),
             username=dict(type='str', required=False),
             password=dict(type='str', required=False, no_log=True),
-            provider=dict(type='dict', required=False, no_log=True),
+            provider=dict(type='dict', required=False),
             timeout=dict(type='int', required=False, default=60),
             optional_args=dict(required=False, type='dict', default=None),
             config_file=dict(type='str', required=False),
@@ -200,6 +200,15 @@ def main():
 
     provider = module.params['provider'] or {}
 
+    no_log = ['password', 'secret']
+    for param in no_log:
+        if provider.get(param):
+            module.no_log_values.update(return_values(provider[param]))
+        if provider.get('optional_args') and provider['optional_args'].get(param):
+            module.no_log_values.update(return_values(provider['optional_args'].get(param)))
+        if module.params.get('optional_args') and module.params['optional_args'].get(param):
+            module.no_log_values.update(return_values(module.params['optional_args'].get(param)))
+
     # allow host or hostname
     provider['hostname'] = provider.get('hostname', None) or provider.get('host', None)
     # allow local params to override provider

library/napalm_parse_yang.py

@@ -138,6 +138,15 @@
 def update_module_provider_data(module):
     provider = module.params['provider'] or {}
 
+    no_log = ['password', 'secret']
+    for param in no_log:
+        if provider.get(param):
+            module.no_log_values.update(return_values(provider[param]))
+        if provider.get('optional_args') and provider['optional_args'].get(param):
+            module.no_log_values.update(return_values(provider['optional_args'].get(param)))
+        if module.params.get('optional_args') and module.params['optional_args'].get(param):
+            module.no_log_values.update(return_values(module.params['optional_args'].get(param)))
+
     # allow host or hostname
     provider['hostname'] = provider.get('hostname', None) \
         or provider.get('host', None)
@@ -252,7 +261,7 @@ def main():
             hostname=dict(type='str', required=False, aliases=['host']),
             username=dict(type='str', required=False),
             password=dict(type='str', required=False, no_log=True),
-            provider=dict(type='dict', required=False, no_log=True),
+            provider=dict(type='dict', required=False),
             file_path=dict(type='str', required=False),
             mode=dict(type='str', required=True,
                       choices=["config", "state", "both"]),

library/napalm_ping.py

@@ -142,7 +142,7 @@ def main():
             hostname=dict(type='str', required=False, aliases=['host']),
             username=dict(type='str', required=False),
             password=dict(type='str', required=False, no_log=True),
-            provider=dict(type='dict', required=False, no_log=True),
+            provider=dict(type='dict', required=False),
             timeout=dict(type='int', required=False, default=60),
             optional_args=dict(required=False, type='dict', default=None),
             dev_os=dict(type='str', required=False, choices=os_choices),
@@ -162,6 +162,15 @@ def main():
 
     provider = module.params['provider'] or {}
 
+    no_log = ['password', 'secret']
+    for param in no_log:
+        if provider.get(param):
+            module.no_log_values.update(return_values(provider[param]))
+        if provider.get('optional_args') and provider['optional_args'].get(param):
+            module.no_log_values.update(return_values(provider['optional_args'].get(param)))
+        if module.params.get('optional_args') and module.params['optional_args'].get(param):
+            module.no_log_values.update(return_values(module.params['optional_args'].get(param)))
+
     # allow host or hostname
     provider['hostname'] = provider.get('hostname', None) or provider.get('host', None)
     # allow local params to override provider

library/napalm_validate.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.basic import AnsibleModule, return_values
 
 try:
     from napalm_base import get_network_driver
@@ -141,6 +141,15 @@ def get_device_instance(module, os_choices):
 
     provider = module.params['provider'] or {}
 
+    no_log = ['password', 'secret']
+    for param in no_log:
+        if provider.get(param):
+            module.no_log_values.update(return_values(provider[param]))
+        if provider.get('optional_args') and provider['optional_args'].get(param):
+            module.no_log_values.update(return_values(provider['optional_args'].get(param)))
+        if module.params.get('optional_args') and module.params['optional_args'].get(param):
+            module.no_log_values.update(return_values(module.params['optional_args'].get(param)))
+
     # allow host or hostname
     provider['hostname'] = provider.get('hostname', None) \
         or provider.get('host', None)
@@ -205,7 +214,7 @@ def main():
             hostname=dict(type='str', required=False, aliases=['host']),
             username=dict(type='str', required=False),
             password=dict(type='str', required=False, no_log=True),
-            provider=dict(type='dict', required=False, no_log=True),
+            provider=dict(type='dict', required=False),
             dev_os=dict(type='str', required=False, choices=os_choices),
             timeout=dict(type='int', required=False, default=60),
             optional_args=dict(type='dict', required=False, default=None),