Merge pull request #52 from shermdog/13

shermdog · shermdog · commit 338356d13855 · 2015-01-14T14:43:34.000-06:00
Add logging for netconify 1.0
diff --git a/library/junos_get_facts b/library/junos_get_facts
@@ -46,7 +46,7 @@ description:
       The information is similar to facts gathered by other IT frameworks.
 requirements:
     - junos-eznc >= 1.1.0
-    - junos-netconify >= 0.1.1, when using the I(console) option
+    - junos-netconify >= 1.0.0, when using the I(console) option
 options:
     host:
         description:
@@ -115,6 +115,7 @@ import os
 
 
 def main():
+    import re
     module = AnsibleModule(
         argument_spec=dict(
             host=dict(required=True),
@@ -133,7 +134,6 @@ def main():
         try:
             from jnpr.junos import Device
             from jnpr.junos.version import VERSION
-            import re
             if not float(re.match('\d+.\d+', VERSION).group()) >= 1.1:
                 module.fail_json(msg='junos-eznc >= 1.1.x is required for this module')
         except ImportError:
@@ -159,8 +159,11 @@ def main():
         # -----------
         try:
             from netconify.cmdo import netconifyCmdo
+            from netconify.constants import version
+            if not float(re.match('\d+.\d+', version).group()) >= 1.0:
+                module.fail_json(msg='junos-netconify >= 1.0.x is required for this module')
         except ImportError:
-            module.fail_json(msg='junos-netconify is required for this module')
+            module.fail_json(msg='junos-netconify >= 1.0.x is required for this module')
         import logging
 
         c_args = []
@@ -180,16 +183,19 @@ def main():
                                 format='%(asctime)s:%(name)s:%(message)s')
             logging.getLogger().name = 'NETCONIFY:' + module.params['host']
 
-            def log_notify(event, message):
+            def log_notify(self, event, message):
                 logging.info("%s:%s" % (event, message))
             use_notifier = log_notify
         else:
-            def silent_notify(event, message):
+            def silent_notify(self, event, message):
                 pass
             use_notifier = silent_notify
 
-        nc = netconifyCmdo(notify=use_notifier)
-        c_results = nc.run(c_args)
+        try:
+            nc = netconifyCmdo(notify=use_notifier)
+            c_results = nc.run(c_args)
+        except Exception as err:
+            module.fail_json(msg=str(err))
         m_results['args'] = m_args        # for debug
         m_results['facts'] = c_results['facts']
 
diff --git a/library/junos_install_config b/library/junos_install_config
@@ -52,7 +52,7 @@ description:
       Configurations performed through the console must only use ASCII text formatting.
 requirements:
     - junos-eznc >= 1.1.0
-    - junos-netconify >= 0.1.1, when using the I(console) option
+    - junos-netconify >= 1.0.0, when using the I(console) option
 options:
     host:
         description:
@@ -152,14 +152,14 @@ EXAMPLES = '''
 
 import logging
 from os.path import isfile
-
 import os
+import re
+
 try:
     from jnpr.junos import Device
     from jnpr.junos.exception import *
     from jnpr.junos.utils.config import Config
     from jnpr.junos.version import VERSION
-    import re
     if not float(re.match('\d+.\d+', VERSION).group()) >= 1.1:
         HAS_PYEZ = False
     else:
@@ -301,8 +301,11 @@ def _load_via_netconf(module):
 def _load_via_console(module):
     try:
         from netconify.cmdo import netconifyCmdo
+        from netconify.constants import version
+        if not float(re.match('\d+.\d+', version).group()) >= 1.0:
+            module.fail_json(msg='junos-netconify >= 1.0.x is required for this module')
     except ImportError:
-        module.fail_json(msg='junos-netconify is required for this module')
+        module.fail_json(msg='junos-netconify >= 1.0.x is required for this module')
 
     m_args = module.params
 
@@ -331,16 +334,19 @@ def _load_via_console(module):
                             format='%(asctime)s:%(name)s:%(message)s')
         logging.getLogger().name = 'NETCONIFY:' + m_args['host']
 
-        def log_notify(event, message):
+        def log_notify(self, event, message):
             logging.info("%s:%s" % (event, message))
         use_notifier = log_notify
     else:
-        def silent_notify(event, message):
+        def silent_notify(self, event, message):
             pass
         use_notifier = silent_notify
 
-    nc = netconifyCmdo(notify=use_notifier)
-    c_results = nc.run(c_args)
+    try:
+        nc = netconifyCmdo(notify=use_notifier)
+        c_results = nc.run(c_args)
+    except Exception as err:
+        module.fail_json(msg=str(err))
     m_results = dict(changed=c_results['changed'])
     if c_results['failed'] is True:
         module.fail_json(msg=c_results['errmsg'])
diff --git a/library/junos_install_os b/library/junos_install_os
@@ -130,7 +130,6 @@ import os
 try:
     from jnpr.junos import Device
     from jnpr.junos.version import VERSION
-    import re
     if not float(re.match('\d+.\d+', VERSION).group()) >= 1.1:
         HAS_PYEZ = False
     else:
diff --git a/library/junos_zeroize b/library/junos_zeroize
@@ -53,7 +53,7 @@ description:
       as root in order to access the device.
 requirements:
     - junos-eznc >= 1.1.0
-    - junos-netconify >= 0.1.1, when using the I(console) option
+    - junos-netconify >= 1.0.0, when using the I(console) option
 options:
     host:
         description:
@@ -106,6 +106,7 @@ EXAMPLES = '''
 
 import os
 import logging
+import re
 
 
 def main():
@@ -135,14 +136,14 @@ def main():
     logfile = module.params['logfile']
     if logfile is not None:
         logging.basicConfig(filename=logfile, level=logging.INFO,
-            format='%(asctime)s:%(name)s:%(message)s')
+                            format='%(asctime)s:%(name)s:%(message)s')
         logging.getLogger().name = 'NETCONIFY:' + module.params['host']
 
-        def log_notify(event, message):
+        def log_notify(self, event, message):
             logging.info("%s:%s" % (event, message))
         use_notifier = log_notify
     else:
-        def silent_notify(event, message):
+        def silent_notify(self, event, message):
             pass
         use_notifier = silent_notify
 
@@ -151,31 +152,33 @@ def main():
         try:
             from jnpr.junos import Device
             from jnpr.junos.version import VERSION
-            import re
             if not float(re.match('\d+.\d+', VERSION).group()) >= 1.1:
                 module.fail_json(msg='junos-eznc >= 1.1.x is required for this module')
         except ImportError:
             module.fail_json(msg='junos-eznc >= 1.1.x is required for this module')
 
         dev = Device(args['host'], user=args['user'], password=args['passwd'], port=args['port'])
         try:
-            use_notifier('LOGIN', 'host={0}'.format(args['host']))
+            use_notifier(None, 'LOGIN', 'host={0}'.format(args['host']))
             dev.open()
-            use_notifier('LOGIN', 'OK')
+            use_notifier(None, 'LOGIN', 'OK')
         except Exception as err:
             msg = 'unable to connect to {0}: {1}'.format(args['host'], str(err))
             module.fail_json(msg=msg)
             # --- UNREACHABLE ---
 
-        use_notifier('ZEROIZE', 'invoking command')
+        use_notifier(None, 'ZEROIZE', 'invoking command')
         dev.cli('request system zeroize')
         results['changed'] = True
         # no close, we're done after this point.
     else:
         try:
             from netconify.cmdo import netconifyCmdo
+            from netconify.constants import version
+            if not float(re.match('\d+.\d+', version).group()) >= 1.0:
+                module.fail_json(msg='junos-netconify >= 1.0.x is required for this module')
         except ImportError:
-            module.fail_json(msg='junos-netconify is required for this module')
+            module.fail_json(msg='junos-netconify >= 1.0.x is required for this module')
         nc_args = []
         nc_args.append(args['console'])
         nc_args.append('--zeroize')
@@ -184,12 +187,15 @@ def main():
         if args['passwd'] is not None:
             nc_args.append('--passwd=' + args['passwd'])
 
-        nc = netconifyCmdo(notify=use_notifier)
-        nc.run(nc_args)
+        try:
+            nc = netconifyCmdo(notify=use_notifier)
+            nc.run(nc_args)
+        except Exception as err:
+            module.fail_json(msg=str(err))
         results['changed'] = True
 
     # indicate done in the logfile and return results
-    use_notifier('DONE', 'OK')
+    use_notifier(None, 'DONE', 'OK')
     module.exit_json(**results)
 
 from ansible.module_utils.basic import *
