feat: Add additional error handling to some upgrade assurance modules (…

…PaloAltoNetworks#561)

plugins/modules/panos_readiness_checks.py

@@ -148,6 +148,7 @@
 
 try:
     from panos_upgrade_assurance.check_firewall import CheckFirewall
+    from panos_upgrade_assurance.exceptions import UpdateServerConnectivityException
     from panos_upgrade_assurance.firewall_proxy import FirewallProxy
 except ImportError:
     pass
@@ -180,14 +181,24 @@ def main():
     checks = CheckFirewall(
         node=firewall, skip_force_locale=module.params["skip_force_locale"]
     )
-    results = checks.run_readiness_checks(checks_configuration=module.params["checks"])
-
-    if module.params["force_fail"]:
-        for check in list(results.keys()):
-            if results[check]["state"]:
-                del results[check]
-            else:
-                module_failed = True
+
+    try:
+        results = checks.run_readiness_checks(
+            checks_configuration=module.params["checks"]
+        )
+    except UpdateServerConnectivityException as exc:
+        results["active_support"] = {
+            "state": False,
+            "reason": getattr(exc, "message", repr(exc)),
+        }
+        module_failed = True
+    else:
+        if module.params["force_fail"]:
+            for check in list(results.keys()):
+                if results[check]["state"]:
+                    del results[check]
+                else:
+                    module_failed = True
 
     module.exit_json(changed=False, response=results, failed=module_failed)
 

plugins/modules/panos_snapshot_report.py

@@ -166,6 +166,7 @@
 try:
     import panos_upgrade_assurance
     from panos_upgrade_assurance.snapshot_compare import SnapshotCompare
+    from panos_upgrade_assurance.exceptions import SnapshotSchemeMismatchException
 except ImportError:
     PUA_AVAILABLE = False
     pass
@@ -198,10 +199,13 @@ def main():
             )
         )
 
-    results = SnapshotCompare(
-        left_snapshot=module.params["left_snapshot"],
-        right_snapshot=module.params["right_snapshot"],
-    ).compare_snapshots(reports=module.params["reports"])
+    try:
+        results = SnapshotCompare(
+            left_snapshot=module.params["left_snapshot"],
+            right_snapshot=module.params["right_snapshot"],
+        ).compare_snapshots(reports=module.params["reports"])
+    except SnapshotSchemeMismatchException as exc:
+        module.fail_json(msg=getattr(exc, "message", repr(exc)))
 
     module.exit_json(changed=False, response=results)