Fix for pb.juniper_junos_jsnapy.yml

ansible_collections/juniper/device/plugins/connection/pyez.py

@@ -541,7 +541,7 @@ def invoke_jsnapy(self, data, action):
             elif action == 'snapcheck':
                 responses = jsa.snapcheck(data=data,
                                           dev=self.dev,
-                                          file_name='PRE')
+                                          pre_file='PRE')
             elif action == 'snap_pre':
                 responses = jsa.snap(data=data,
                                      dev=self.dev,

ansible_collections/juniper/device/plugins/modules/jsnapy.py

@@ -285,22 +285,38 @@ def main():
         jsa = junos_module.jsnapy.SnapAdmin()
         junos_module.logger.debug('Executing %s action.', action)
         if action == 'check':
-            responses = jsa.check(data=data,
-                                  dev=junos_module.dev,
-                                  pre_file='PRE',
-                                  post_file='POST')
-        elif action == 'snapcheck':
-            responses = jsa.snapcheck(data=data,
+            if junos_module.conn_type != "local":
+                responses = junos_module._pyez_conn.invoke_jsnapy(data=data,
+                                                                  action='check')
+            else:
+                responses = jsa.check(data=data,
                                       dev=junos_module.dev,
-                                      pre_file='PRE')
+                                      pre_file='PRE',
+                                      post_file='POST')
+        elif action == 'snapcheck':
+            if junos_module.conn_type != "local":
+                responses = junos_module._pyez_conn.invoke_jsnapy(data=data,
+                                                                  action='snapcheck')
+            else:
+                responses = jsa.snapcheck(data=data,
+                                          dev=junos_module.dev,
+                                          pre_file='PRE')
         elif action == 'snap_pre':
-            responses = jsa.snap(data=data,
-                                 dev=junos_module.dev,
-                                 file_name='PRE')
+            if junos_module.conn_type != "local":
+                responses = junos_module._pyez_conn.invoke_jsnapy(data=data,
+                                                                  action='snap_pre')
+            else:
+                responses = jsa.snap(data=data,
+                                     dev=junos_module.dev,
+                                     file_name='PRE')
         elif action == 'snap_post':
-            responses = jsa.snap(data=data,
-                                 dev=junos_module.dev,
-                                 file_name='POST')
+            if junos_module.conn_type != "local":
+                responses = junos_module._pyez_conn.invoke_jsnapy(data=data,
+                                                                  action='snap_post')
+            else:
+                responses = jsa.snap(data=data,
+                                     dev=junos_module.dev,
+                                     file_name='POST')
         else:
             junos_module.fail_json(msg="Unexpected action: %s." % (action))
         junos_module.logger.debug('The %s action executed successfully.',
@@ -340,6 +356,32 @@ def main():
                                   results['total_failed'])
         elif action in ('snap_pre', 'snap_post'):
             results['msg'] = "The %s action successfully executed." % (action)
+    elif isinstance(responses, dict) and len(responses) >= 1:
+        if action in ('snapcheck', 'check'):
+            results['device'] = responses["device"]
+            results['router'] = responses["router"]
+            results['final_result'] = responses["final_result"]
+            results['total_passed'] = responses["total_passed"]
+            results['total_failed'] = responses["total_failed"]
+            results['test_results'] = responses["test_results"]
+            total_tests = int(responses["total_passed"]) + int(responses["total_failed"])
+            results['total_tests'] = total_tests
+            pass_percentage = 0
+            if total_tests > 0:
+                pass_percentage = ((int(responses["total_passed"]) * 100) //
+                                   total_tests)
+            results['passPercentage'] = pass_percentage
+            results['pass_percentage'] = pass_percentage
+            if results['final_result'] == 'Failed':
+                results['msg'] = 'Test Failed: Passed %s, Failed %s' % \
+                                 (results['total_passed'],
+                                  results['total_failed'])
+            else:
+                results['msg'] = 'Test Passed: Passed %s, Failed %s' % \
+                                 (results['total_passed'],
+                                  results['total_failed'])
+        elif action in ('snap_pre', 'snap_post'):
+            results['msg'] = "The %s action successfully executed." % (action)
     else:
         junos_module.fail_json(msg="Unexpected JSNAPy responses. Type: %s."
                                    "Responses: %s" %

tests/pb.juniper_junos_jsnapy.yml

@@ -1,7 +1,6 @@
 ---
 - name: Test juniper.device.jsnapy module
   hosts: all
-  connection: local
   gather_facts: no
   collections:
     - juniper.device
@@ -127,13 +126,30 @@
           - test6.passPercentage == 100
       tags: [ test6 ]
 
+##################################################
+####    TEST 7 PREREQUSITE                      ##
+##################################################
+    - name: "PRE-TEST 7 - Add loopback address"
+      config:
+        load: 'merge'
+        lines:
+          - "set routing-instances LO10 interface lo0.10"
+          - "set routing-instances LO10 instance-type virtual-router"
+          - "set interfaces lo0 unit 10 family inet"
+      register: test7_0
+      ignore_errors: True
+      tags: [ test7 ]
+
 ##################################################
 ####    TEST 7                                  ##
 ##################################################
     - name: "PRE-TEST 7 - Add loopback address"
       config:
         load: 'merge'
-        file: junos_jsnapy/add_loopback.set
+        lines:
+          - "set routing-instances LO10 interface lo0.10"
+          - "set routing-instances LO10 instance-type virtual-router"
+          - "set interfaces lo0 unit 10 family inet"
       register: test7_1
       ignore_errors: True
       tags: [ test7 ]
@@ -163,12 +179,19 @@
 
     - name: "TEST 7 - Cleanup"
       config:
-        file: junos_jsnapy/delete_loopback.set
         load: 'merge'
+        lines:
+          - "delete routing-instances LO10"
+          - "delete interfaces lo0 unit 10"
       register: test7_3
       ignore_errors: True
       tags: [ test7 ]
 
+    - name: Sleep for 15 seconds for loopback to come up
+      ansible.builtin.wait_for:
+        timeout: 15
+      delegate_to: localhost
+
     - name: Check TEST 7
       assert:
         that: