Sync Up to resolve merge conflicts

Author: rsmekala

Dockerfile

@@ -24,6 +24,7 @@ RUN tar -czf Juniper.junos ansible-junos-stdlib &&\
     apk update && apk add ca-certificates &&\
     apk add openssh-client &&\
     apk add build-base gcc g++ make python-dev &&\
+    apk update && apk add py-pip &&\
     pip install --upgrade pip setuptools &&\
     pip install jxmlease &&\
     pip install ansible==$ver_ansible &&\

ISSUE_TEMPLATE.md

@@ -0,0 +1,55 @@
+<!---
+Verify first that your issue/request is not already reported on GitHub. -->
+
+Issue Type
+------
+<!--- Pick one below and delete the rest -->
+ - Bug Report
+ - Feature Idea
+ - Documentation Report
+
+Module Name
+------
+<!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature
+-->
+
+Juniper.Junos role and Python libraries version
+<!--- Paste, BELOW THIS COMMENT, verbatim output from "ansible --version" and  "pip freeze" between quotes below 
+Also provide the version of Juniper.junos role-->
+```
+
+```
+
+OS / Environment
+------
+<!--- Mention, the JUNOS version and firmware model you are trying to control-->
+
+Summary
+------
+<!--- Explain the problem briefly -->
+
+Steps to reproduce
+------
+<!--- For bugs, show exactly how to reproduce the problem, using a minimal test-case.
+For new features, show how the feature would be used. -->
+
+<!--- Paste example playbooks or commands between quotes below -->
+```yaml
+
+```
+
+<!--- You can also paste gist.github.com links for larger files -->
+
+Expected results
+<!--- What did you expect to happen when running the steps above? -->
+```
+
+```
+Actual results
+------
+<!--- What actually happened? If possible run with extra verbosity (-vvvv) -->
+
+<!--- Paste verbatim command output between quotes below -->
+```
+
+```

callback_plugins/jsnapy.py

@@ -31,25 +31,20 @@ def __init__(self):
 
   def v2_runner_on_ok(self, result):
     """
-    Collect test results for all tests executed if module is junos_jsnapy
+    Collect test results for all tests executed if action is snapcheck or check
     """
 
     ## Extract module name
-    module_name = ''
     module_args = {}
     if 'invocation' in result._result:
-      if 'module_name' in result._result['invocation']:
-        module_name = result._result['invocation']['module_name']
+      if 'module_args' in result._result['invocation']:
         module_args = result._result['invocation']['module_args']
 
     ## Check if dic return has all valid information
-    if module_name == '' or module_args == {}:
-        return None
-    elif 'action' not in module_args:
+    if 'action' not in module_args:
         return None
 
-    if module_name == 'junos_jsnapy' and \
-    ( module_args['action'] == 'snapcheck' or module_args['action'] == 'check' ):
+    if module_args['action'] == 'snapcheck' or module_args['action'] == 'check':
 
       ## Check if dict entry already exist for this host
       host = result._host.name

library/juniper_junos_facts.py

@@ -208,11 +208,11 @@ def get_facts_dict(junos_module):
         del facts['2RE']
     # The value of the 'version_info' key is a custom junos.version_info
     # object. Convert this value to a dict.
-    if 'version_info' in facts:
+    if 'version_info' in facts and facts['version_info'] is not None:
         facts['version_info'] = dict(facts['version_info'])
     # The values of the ['junos_info'][re_name]['object'] keys are
     # custom junos.version_info objects. Convert all of these to dicts.
-    if 'junos_info' in facts:
+    if 'junos_info' in facts and facts['junos_info'] is not None:
         for key in facts['junos_info']:
             facts['junos_info'][key]['object'] = dict(
                 facts['junos_info'][key]['object'])

library/juniper_junos_jsnapy.py

@@ -211,6 +211,7 @@
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils import juniper_junos_common
 
+
 def main():
     JSNAPY_ACTION_CHOICES = ['check', 'snapcheck', 'snap_pre', 'snap_post']
 

module_utils/juniper_junos_common.py

@@ -289,6 +289,13 @@ class ModuleDocFragment(object):
         type: path
         aliases:
           - ssh_keyfile
+      ssh_config:
+        description:
+          - The path to the SSH client configuration file. If this option is not
+            specified, then the PyEZ Device instance by default queries file
+            ~/.ssh/config.
+        required: false
+        type: path
       timeout:
         description:
           - The maximum number of seconds to wait for RPC responses from the
@@ -332,7 +339,7 @@ class ModuleDocFragment(object):
           - The log file must be writeable. If the file already exists, it is
             appended. It is the users responsibility to delete/rotate log files.
           - The level of information logged in this file is controlled by
-            Ansible's verbosity and debug options
+            Ansible's verbosity, debug options and level option in task
           - 1) By default, messages at level C(WARNING) or higher are logged.
           - 2) If the C(-v) or C(--verbose) command-line options to the
                C(ansible-playbook) command are specified, messages at level
@@ -341,6 +348,8 @@ class ModuleDocFragment(object):
                C(ansible-playbook) command is specified, or the C(ANSIBLE_DEBUG)
                environment variable is set, then messages at level C(DEBUG) or
                higher are logged.
+          - 4) If C(level) is mentioned then messages at level C(level) or more are
+               logged.
           - The I(logfile) and I(logdir) options are mutually exclusive. The
             I(logdir) option is recommended for all new playbooks.
         required: false
@@ -355,7 +364,7 @@ class ModuleDocFragment(object):
           - The log file must be writeable. If the file already exists, it is
             appended. It is the users responsibility to delete/rotate log files.
           - The level of information logged in this file is controlled by
-            Ansible's verbosity and debug options
+            Ansible's verbosity, debug options and level option in task
           - 1) By default, messages at level C(WARNING) or higher are logged.
           - 2) If the C(-v) or C(--verbose) command-line options to the
                C(ansible-playbook) command are specified, messages at level
@@ -364,6 +373,8 @@ class ModuleDocFragment(object):
                C(ansible-playbook) command is specified, or the C(ANSIBLE_DEBUG)
                environment variable is set, then messages at level C(DEBUG) or
                higher are logged.
+          - 4) If C(level) is mentioned then messages at level C(level) or more are
+               logged.
           - When tasks are executed against more than one target host,
             one process is forked for each target host. (Up to the maximum
             specified by the forks configuration. See
@@ -381,6 +392,27 @@ class ModuleDocFragment(object):
         type: path
         aliases:
           - log_file
+      level:
+        description:
+          - The level of information to be logged can be modified using this option
+          - 1) By default, messages at level C(WARNING) or higher are logged.
+          - 2) If the C(-v) or C(--verbose) command-line options to the
+               C(ansible-playbook) command are specified, messages at level
+               C(INFO) or higher are logged.
+          - 3) If the C(-vv) (or more verbose) command-line option to the
+               C(ansible-playbook) command is specified, or the C(ANSIBLE_DEBUG)
+               environment variable is set, then messages at level C(DEBUG) or
+               higher are logged.
+          - 4) If C(level) is mentioned then messages at level C(level) or more are
+               logged.
+        required: false
+        default: WARNING
+        type: str
+        choices:
+          - INFO
+          - DEBUG
+               
+
 '''
 
     # _SUB_CONNECT_DOCUMENTATION is just _CONNECT_DOCUMENTATION with each
@@ -443,6 +475,9 @@ class ModuleDocFragment(object):
                                  # Default behavior coded in
                                  # JuniperJunosActionModule.run()
                                  default=None),
+    'ssh_config': dict(type='path',
+                                 required=False,
+                                 default=None),
     'mode': dict(choices=[None, 'telnet', 'serial'],
                  default=None),
     'console': dict(type='str',
@@ -497,7 +532,8 @@ class ModuleDocFragment(object):
 # Specify the logging spec.
 logging_spec = {
     'logfile': dict(type='path', required=False, default=None),
-    'logdir': dict(type='path', required=False, default=None)
+    'logdir': dict(type='path', required=False, default=None),
+    'level': dict(choices=[None, 'INFO', 'DEBUG'], required=False, default=None)
 }
 
 # The logdir and logfile options are mutually exclusive.
@@ -874,6 +910,9 @@ def process(self, msg, kwargs):
             level = logging.INFO
         elif self._verbosity > 1:
             level = logging.DEBUG
+        # Set level as mentioned in task
+        elif self.params.get('level') is not None:
+            level = self.params.get('level')
         # Get the logger object to be used for our logging.
         logger = logging.getLogger('jnpr.ansible_module.' + self.module_name)
         # Attach the NullHandler to avoid any errors if no logging is needed.