fix up

Signed-off-by: Mahesh Shetty <[email protected]>

ocs_ci/helpers/helpers.py

@@ -5673,6 +5673,13 @@ def create_network_fence(node_name, cidr):
     """
     Create NetworkFence for the node
 
+    Args:
+        node_name (str): Name of the node
+        cidr (str): cidr
+
+    Returns:
+        OCS: NetworkFence object
+
     """
     logger.info("Creating NetworkFence")
     network_fence_dict = templating.load_yaml(constants.NETWORK_FENCE_CRD)
@@ -5683,6 +5690,7 @@ def create_network_fence(node_name, cidr):
         logger.info(
             f"NetworkFence {network_fence_obj.name} for node {node_name} created successfully"
         )
+    return network_fence_obj
 
 
 def unfence_node(node_name):

tests/functional/disaster-recovery/sc_arbiter/test_zone_unaware_app.py

@@ -109,15 +109,15 @@ def finalizer():
     @pytest.mark.parametrize(
         argnames="fencing",
         argvalues=[
-            pytest.param(
-                True,
-            ),
+            # pytest.param(
+            #     True,
+            # ),
             pytest.param(
                 False,
             ),
         ],
         ids=[
-            "With-Fencing",
+            # "With-Fencing",
             "Without-Fencing",
         ],
     )
@@ -171,6 +171,7 @@ def test_zone_shutdowns(
             )
             log.info(f"Nodes of zone {zone} are shutdown successfully")
 
+            network_fence_objs = []
             if fencing:
 
                 # If fencing is True, then we need to fence the nodes after shutdown
@@ -195,8 +196,10 @@ def test_zone_shutdowns(
                     ]
 
                     # Create the network fence
-                    retry(CommandFailed, tries=5)(create_network_fence)(
-                        node.name, cidr=cidrs[0]
+                    network_fence_objs.append(
+                        retry(CommandFailed, tries=5)(create_network_fence)(
+                            node.name, cidr=cidrs[0]
+                        )
                     )
 
                 # Taint the nodes that are shutdown
@@ -267,6 +270,10 @@ def test_zone_shutdowns(
                     "Successfully removed taints from the nodes that were shutdown"
                 )
 
+                # Delete NetworkFence objects for each of the nodes
+                for network_fence in network_fence_objs:
+                    network_fence.delete()
+
             # Start the nodes that were shutdown
             log.info(f"Starting the {zone} nodes")
             try: