fix: Fixed several attributes and rule reorder logic

zscaler · Apr 30, 2024 · d9fe168 · d9fe168
1 parent d67cf1e
commit d9fe168
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 35 deletions.
diff --git a/plugins/modules/zpa_app_protection_custom_control.py b/plugins/modules/zpa_app_protection_custom_control.py
@@ -344,9 +344,9 @@ def core(module):
         if key not in fields_to_exclude:
             if not deep_equal(current_control.get(key), value):
                 differences_detected = True
-                module.warn(
-                    "Difference detected in {key}. Current: {current_control.get(key)}, Desired: {value}"
-                )
+                # module.warn(
+                #     "Difference detected in {key}. Current: {current_control.get(key)}, Desired: {value}"
+                # )
 
     # Validate the desired control values
     try:

diff --git a/plugins/modules/zpa_application_segment.py b/plugins/modules/zpa_application_segment.py
@@ -333,9 +333,9 @@ def core(module):
     for key, value in desired_app.items():
         if key not in fields_to_exclude and current_app.get(key) != value:
             differences_detected = True
-            module.warn(
-                f"Difference detected in {key}. Current: {current_app.get(key)}, Desired: {value}"
-            )
+            # module.warn(
+            #     f"Difference detected in {key}. Current: {current_app.get(key)}, Desired: {value}"
+            # )
 
     if existing_app is not None:
         id = existing_app.get("id")
@@ -385,7 +385,7 @@ def core(module):
                         ),
                     )
                 )
-                module.warn("Payload Update for SDK: {}".format(existing_app))
+                # module.warn("Payload Update for SDK: {}".format(existing_app))
                 existing_app = client.app_segments.update_segment(
                     **existing_app
                 ).to_dict()
@@ -394,7 +394,7 @@ def core(module):
                 """No Changes Needed"""
                 module.exit_json(changed=False, data=existing_app)
         else:
-            module.warn("Creating new rule as no existing rule found")
+            # module.warn("Creating new rule as no existing rule found")
             """Create"""
             app = deleteNone(
                 dict(
@@ -423,7 +423,7 @@ def core(module):
                     udp_port_ranges=convert_ports_list(app.get("udp_port_range", None)),
                 )
             )
-            module.warn("Payload for SDK: {}".format(app))
+            # module.warn("Payload for SDK: {}".format(app))
             app = client.app_segments.add_segment(**app)
             module.exit_json(changed=True, data=app)
     elif (

diff --git a/plugins/modules/zpa_application_segment_inspection.py b/plugins/modules/zpa_application_segment_inspection.py
@@ -476,9 +476,9 @@ def core(module):
         if key not in fields_to_exclude and current_app.get(key) != value:
             differences_detected = True
             break
-        module.warn(
-            f"Difference detected in {key}. Current: {current_app.get(key)}, Desired: {value}"
-        )
+        # module.warn(
+        #     f"Difference detected in {key}. Current: {current_app.get(key)}, Desired: {value}"
+        # )
 
     if existing_app is not None:
         id = existing_app.get("id")

diff --git a/plugins/modules/zpa_application_segment_pra.py b/plugins/modules/zpa_application_segment_pra.py
@@ -464,9 +464,9 @@ def core(module):
         if key not in fields_to_exclude and current_app.get(key) != value:
             differences_detected = True
             break
-        module.warn(
-            f"Difference detected in {key}. Current: {current_app.get(key)}, Desired: {value}"
-        )
+        # module.warn(
+        #     f"Difference detected in {key}. Current: {current_app.get(key)}, Desired: {value}"
+        # )
 
     if existing_app is not None:
         id = existing_app.get("id")

diff --git a/plugins/modules/zpa_policy_access_app_protection_rule.py b/plugins/modules/zpa_policy_access_app_protection_rule.py
@@ -241,9 +241,9 @@ def core(module):
         for key, value in desired_policy.items():
             if key not in fields_to_exclude and current_policy.get(key) != value:
                 differences_detected = True
-                module.warn(
-                    f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
-                )
+                # module.warn(
+                #     f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
+                # )
 
     if existing_policy:
         desired_order = policy.get("rule_order")

diff --git a/plugins/modules/zpa_policy_access_forwarding_rule.py b/plugins/modules/zpa_policy_access_forwarding_rule.py
@@ -251,9 +251,9 @@ def core(module):
         for key, value in desired_policy.items():
             if key not in fields_to_exclude and current_policy.get(key) != value:
                 differences_detected = True
-                module.warn(
-                    f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
-                )
+                # module.warn(
+                #     f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
+                # )
 
     if existing_policy:
         desired_order = policy.get("rule_order")

diff --git a/plugins/modules/zpa_policy_access_isolation_rule.py b/plugins/modules/zpa_policy_access_isolation_rule.py
@@ -238,9 +238,9 @@ def core(module):
         for key, value in desired_policy.items():
             if key not in fields_to_exclude and current_policy.get(key) != value:
                 differences_detected = True
-                module.warn(
-                    f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
-                )
+                # module.warn(
+                #     f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
+                # )
 
     if existing_policy:
         desired_order = policy.get("rule_order")

diff --git a/plugins/modules/zpa_policy_access_rule.py b/plugins/modules/zpa_policy_access_rule.py
@@ -298,9 +298,9 @@ def core(module):
         for key, value in desired_policy.items():
             if key not in fields_to_exclude and current_policy.get(key) != value:
                 differences_detected = True
-                module.warn(
-                    f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
-                )
+                # module.warn(
+                #     f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
+                # )
 
     if existing_policy:
         desired_order = policy.get("rule_order")

diff --git a/plugins/modules/zpa_policy_access_timeout_rule.py b/plugins/modules/zpa_policy_access_timeout_rule.py
@@ -290,9 +290,9 @@ def core(module):
         for key, value in desired_policy.items():
             if key not in fields_to_exclude and current_policy.get(key) != value:
                 differences_detected = True
-                module.warn(
-                    f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
-                )
+                # module.warn(
+                #     f"Difference detected in {key}. Current: {current_policy.get(key)}, Desired: {value}"
+                # )
 
     if existing_policy:
         desired_order = policy.get("rule_order")

diff --git a/plugins/modules/zpa_service_edge_groups.py b/plugins/modules/zpa_service_edge_groups.py
@@ -255,9 +255,9 @@ def core(module):
     for key, value in desired_group.items():
         if key not in fields_to_exclude and current_group.get(key) != value:
             differences_detected = True
-            module.warn(
-                f"Difference detected in {key}. Current: {current_group.get(key)}, Desired: {value}"
-            )
+            # module.warn(
+            #     f"Difference detected in {key}. Current: {current_group.get(key)}, Desired: {value}"
+            # )
 
     if existing_group is not None:
         id = existing_group.get("id")

diff --git a/tests/integration/targets/zpa_server_group/tasks/main.yml b/tests/integration/targets/zpa_server_group/tasks/main.yml
@@ -106,7 +106,7 @@
     - name: Verify Server Group is present (again; idempotency check)
       ansible.builtin.assert:
         that:
-          - result.changed
+          - not result.changed
 
     - name: Fetch all Server Groups
       zscaler.zpacloud.zpa_server_group_facts:

diff --git a/tests/integration/targets/zpa_service_edge_groups/tasks/main.yml b/tests/integration/targets/zpa_service_edge_groups/tasks/main.yml
@@ -113,7 +113,7 @@
     - name: Ensure Service Edge Group is absent (idempotency check)
       ansible.builtin.assert:
         that:
-          - result.changed
+          - not result.changed
 
     - name: Fetch all Service Edge Groups
       zscaler.zpacloud.zpa_service_edge_groups_facts: