Trying to merge upstream changes into my fork.

Dockerfile

@@ -0,0 +1,25 @@
+FROM juniper/pyez:2.0.1
+MAINTAINER [email protected]
+
+WORKDIR /tmp
+RUN mkdir /tmp/ansible-junos-stdlib &&\
+    mkdir /tmp/ansible-junos-stdlib/library &&\
+    mkdir /tmp/ansible-junos-stdlib/meta &&\
+    mkdir /project
+
+ADD library /tmp/ansible-junos-stdlib/library
+ADD meta /tmp/ansible-junos-stdlib/meta
+
+RUN tar -czf Juniper.junos ansible-junos-stdlib &&\
+    apk update && apk add ca-certificates &&\
+    apk add build-base gcc g++ make python-dev &&\
+    pip install junos-netconify &&\
+    pip install jxmlease &&\
+    pip install ansible &&\
+    ansible-galaxy install Juniper.junos &&\
+    apk del -r --purge gcc make g++ &&\
+    rm -rf /source/* &&\
+    rm -rf /var/cache/apk/* &&\
+    rm -rf /tmp/*
+
+WORKDIR /project

README.md

@@ -4,16 +4,52 @@ Juniper Networks provides support for using Ansible to deploy devices running th
 
 ## OVERVIEW OF MODULES
 
+- junos_get_facts — Retrieve device-specific information from the host.
+- junos_rpc — To execute RPC on device and save output locally
+- junos_cli — To execute CLI on device and save output locally
 - junos_commit — Commit candidate configuration on device.
 - junos_get_config — Retrieve configuration of device.
-- junos_get_facts — Retrieve device-specific information from the host.
 - junos_install_config — Modify the configuration of a device running Junos OS.
 - junos_install_os — Install a Junos OS software package.
 - junos_rollback — Rollback configuration of device.
 - junos_shutdown — Shut down or reboot a device running Junos OS.
 - junos_srx_cluster — Enable/Disable cluster mode for SRX devices
 - junos_zeroize — Remove all configuration information on the Routing Engines and reset all key values on a device.
+- junos_get_table - Retrieve data from a Junos device using Tables/Views
+- junos_ping - execute ping on junos devices
+- junos_jsnapy - Integrate JSNAPy to ansible which helps audit network devices
+
+### OVERVIEW OF PLUGINS
+
+In addition to the modules listed above, a callback_plugin `jsnapy` is available for the module `junos_jsnapy`.
+
+The callback_plugin `jsnapy` helps to print on the screen additional information regarding
+ jsnapy failed tests.
+For each failed test, a log will be printed after the RECAP of the playbook.  
+
+> The plugin `jsnapy` is currently in **Experimental** stage, please provide feedback.
+
+```
+PLAY RECAP *********************************************************************
+qfx10002-01                : ok=3    changed=0    unreachable=0    failed=1
+qfx10002-02                : ok=3    changed=0    unreachable=0    failed=1
+qfx5100-01                 : ok=1    changed=0    unreachable=0    failed=1
+
+JSNAPy Results for: qfx10002-01 ************************************************
+Value of 'peer-state' not 'is-equal' at '//bgp-information/bgp-peer' with {"peer-as": "65200", "peer-state": "Active", "peer-address": "100.0.0.21"}
+Value of 'peer-state' not 'is-equal' at '//bgp-information/bgp-peer' with {"peer-as": "60021", "peer-state": "Idle", "peer-address": "192.168.0.1"}
+Value of 'oper-status' not 'is-equal' at '//interface-information/physical-interface[normalize-space(admin-status)='up' and logical-interface/address-family/address-family-name ]' with {"oper-status": "down", "name": "et-0/0/18"}
+
+JSNAPy Results for: qfx10002-02 ************************************************
+Value of 'peer-state' not 'is-equal' at '//bgp-information/bgp-peer' with {"peer-as": "65200", "peer-state": "Active", "peer-address": "100.0.0.21"}
+```
 
+Callback plugins are not activated by default and needs to be manually added to the
+configuration file under `[defaults]` with the variable `callback_whitelist`
+```
+[defaults]
+callback_whitelist = jsnapy
+```
 ## DOCUMENTATION
 
 [Official documentation](http://www.juniper.net/techpubs/en_US/release-independent/junos-ansible/information-products/pathway-pages/index.html) (detailed information, includes examples)
@@ -30,19 +66,17 @@ To download the junos role to the Ansible server, execute the ansible-galaxy ins
 
 ```
 [root@ansible-cm]# ansible-galaxy install Juniper.junos
-downloading role 'junos', owned by Juniper
-no version specified, installing 1.0.0
-- downloading role from
-https://github.com/Juniper/ansible-junos-stdlib/archive/1.0.0.tar.gz
-- extracting Juniper.junos to /etc/ansible/roles/Juniper.junos
-Juniper.junos was installed successfully
+- downloading role 'junos', owned by Juniper
+- downloading role from https://github.com/Juniper/ansible-junos-stdlib/archive/1.3.1.tar.gz
+- extracting Juniper.junos to /usr/local/etc/ansible/roles/Juniper.junos
+- Juniper.junos was installed successfully
 ```
 
 ### Git clone
 For testing you can `git clone` this repo and run the `env-setup` script in the repo directory:
 
     user@ansible-junos-stdlib> source env-setup
-    
+
 This will set your `$ANSIBLE_LIBRARY` variable to the repo location and the installed Ansible library path.  For example:
 
 ````
@@ -100,12 +134,15 @@ Thes modules require the following to be installed on the Ansible server:
 ## LICENSE
 
 Apache 2.0
-  
+
 ## CONTRIBUTORS
 
-- Jeremy Schulman (@nwkautomaniac), Core developer
-- Rick Sherman (@shermdog01)
-- Nitin Kumar (@vnitinv)
-- Patrik Bok
-- Ashley Burston
+Juniper Networks is actively contributing to and maintaining this repo. Please contact [email protected] for any queries.
+
+*Contributors:*
+
+[Nitin Kumar](https://github.com/vnitinv), [Stacy W Smith](https://github.com/stacywsmith), [David Gethings](https://github.com/dgjnpr)
+
+*Former Contributors:*
 
+[Jeremy Schulman](https://github.com/jeremyschulman), [Rick Sherman](https://github.com/shermdog)

callback_plugins/jsnapy.py

@@ -0,0 +1,74 @@
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import collections
+import os
+import time
+import pprint
+import json
+
+from ansible.plugins.callback import CallbackBase
+from ansible import constants as C
+
+class CallbackModule(CallbackBase):
+  """
+  This callback add extra logging for the module junos_jsnapy .
+  """
+  CALLBACK_VERSION = 2.0
+  CALLBACK_TYPE = 'aggregate'
+  CALLBACK_NAME = 'jsnapy'
+
+## useful links regarding Callback
+## https://github.com/ansible/ansible/blob/devel/lib/ansible/plugins/callback/__init__.py
+
+  def __init__(self):
+    self._pp = pprint.PrettyPrinter(indent=4)
+    self._results = {}
+
+    super(CallbackModule, self).__init__()
+
+  def v2_runner_on_ok(self, result):
+    """
+    Collect test results for all tests executed if module is junos_jsnapy
+    """
+
+    ## Extract module name
+    module_name = ''
+    if 'invocation' in result._result:
+      if 'module_name' in result._result['invocation']:
+        module_name = result._result['invocation']['module_name']
+
+    if module_name == 'junos_jsnapy':
+      ## Check if dict entry already exist for this host
+      host = result._host.name
+      if not host in self._results.keys():
+        self._results[host] = []
+
+      self._results[host].append(result)
+
+  def v2_playbook_on_stats(self, stats):
+
+    ## Go over all results for all hosts
+    for host, results in self._results.iteritems():
+      has_printed_banner = False
+      for result in results:
+        # self._pp.pprint(result.__dict__)
+        res = result._result
+        if res['final_result'] == "Failed":
+          for test_name, test_results in res['test_results'].iteritems():
+            for testlet in test_results:
+              if testlet['count']['fail'] != 0:
+
+                if not has_printed_banner:
+                  self._display.banner("JSNAPy Results for: " + str(host))
+                  has_printed_banner = True
+
+                for test in testlet['failed']:
+                  self._display.display(
+                    "Value of '{0}' not '{1}' at '{2}' with {3}".format(
+                      str(testlet['node_name']),
+                      str(testlet['testoperation']),
+                      str(testlet['xpath']),
+                      json.dumps(test['post'])),
+                    color=C.COLOR_ERROR)