Juniper · dineshbaburam91 · Apr 29, 2024 · Apr 29, 2024 · Apr 29, 2024
diff --git a/ansible_collections/juniper/device/plugins/modules/srx_cluster.py b/ansible_collections/juniper/device/plugins/modules/srx_cluster.py
@@ -196,9 +196,14 @@ def main():
                'reboot': False,
                'failed': True}
 
+    if junos_module.conn_type == "local":
+        facts = dict(junos_module.dev.facts)
+    else:
+        facts = junos_module.get_facts()
+        # facts checking has been done as part of persitent connection itself.
     junos_module.logger.debug("Check current SRX cluster operational state.")
-    current_cluster_state = junos_module.dev.facts['srx_cluster']
-    current_cluster_id = junos_module.dev.facts['srx_cluster_id']
+    current_cluster_state = facts['srx_cluster']
+    current_cluster_id = facts['srx_cluster_id']
     if current_cluster_id is not None:
         current_cluster_id = int(current_cluster_id)
     if junos_module.conn_type == "local":
@@ -275,8 +280,14 @@ def main():
                             reboot=True, normalize=True
                         )
                     else:
-                        resp = junos_module._pyez_conn.set_chassis_cluster_disable()
-
+                        try:
+                            resp = junos_module._pyez_conn.set_chassis_cluster_disable()
+                        except Exception as err:
+                            # Reboot initiated
+                            # We got Exception ConnectionError
+                            # so handling the exception
+                            resp = None
+                            output = None
                 if resp is not None:
                     output = resp.getparent().findtext('.//output')
                     if output is None:

diff --git a/tests/pb.juniper_junos_facts.yml b/tests/pb.juniper_junos_facts.yml
@@ -1,7 +1,6 @@
 ---
 - name: Test juniper.device.facts module
   hosts: all
-  connection: local
   gather_facts: no
   collections:
     - juniper.device

diff --git a/tests/pb.juniper_junos_persistent_conn.yml b/tests/pb.juniper_junos_persistent_conn.yml
diff --git a/tests/pb.juniper_junos_ping.yml b/tests/pb.juniper_junos_ping.yml
@@ -1,7 +1,6 @@
 ---
 - name: Test juniper.device.ping module
   hosts: all
-  connection: local
   gather_facts: no
   collections:
     - juniper.device

diff --git a/tests/pb.juniper_junos_pmtud.yml b/tests/pb.juniper_junos_pmtud.yml
@@ -1,7 +1,6 @@
 ---
 - name: Test juniper.device.pmtud module
   hosts: all
-  connection: local
   gather_facts: no
   collections:
     - juniper.device

diff --git a/tests/pb.juniper_junos_software.yml b/tests/pb.juniper_junos_software.yml
@@ -3,7 +3,6 @@
   hosts: all
   collections:
     - juniper.device
-  connection: local
   gather_facts: no
   vars:
     wait_time: 3600

diff --git a/tests/pb.juniper_junos_software_member.yml b/tests/pb.juniper_junos_software_member.yml
@@ -3,7 +3,6 @@
   hosts: all
   collections:
     - juniper.device
-  connection: local
   gather_facts: no
   vars:
     wait_time: 3600

diff --git a/tests/pb.juniper_junos_srx_cluster.yml b/tests/pb.juniper_junos_srx_cluster.yml
@@ -1,7 +1,6 @@
 ---
 - name: Test juniper.device.srx_cluster module
   hosts: all
-  connection: local
   gather_facts: no
   collections:
     - juniper.device

diff --git a/tests/pb.juniper_junos_system.yml b/tests/pb.juniper_junos_system.yml
@@ -1,7 +1,6 @@
 ---
 - name: Test juniper.device.system module
   hosts: all
-  connection: local
   gather_facts: no
   collections:
     - juniper.device

diff --git a/tests/pb.juniper_junos_table.yml b/tests/pb.juniper_junos_table.yml
@@ -1,7 +1,6 @@
 ---
 - name: Test juniper.device.table PyEZ table/view module.
   hosts: all
-  connection: local
   gather_facts: no
   collections:
     - juniper.device