Incorprated comments on verify part

Signed-off-by: Avdhoot <[email protected]>

ocs_ci/helpers/dr_helpers.py

@@ -36,6 +36,7 @@
     run_cmd,
 )
 from ocs_ci.utility.utils import TimeoutSampler, CommandFailed, run_cmd
+from ocs_ci.helpers.helpers import run_cmd_verify_cli_output
 
 
 logger = logging.getLogger(__name__)
@@ -1118,9 +1119,15 @@ def disable_dr_from_app(secondary_cluster_name):
 
     # Delete all drpc
     run_cmd("oc delete drpc --all -A")
-
-    # Verify all drpc gets deleted
-    # ToDo
+    sample = TimeoutSampler(
+        timeout=300,
+        sleep=5,
+        func=run_cmd_verify_cli_output,
+        cmd="oc get drpc -A",
+        expected_output_lst="No resources found",
+    )
+    if not sample.wait_for_func_status(result=True):
+        raise Exception("All drpcs are not deleted")
 
     # Remove annotation from placements
     for placement in placements:
@@ -1188,7 +1195,10 @@ def replace_cluster(workload, primary_cluster_name, secondary_cluster_name):
     run_cmd(cmd=f"oc delete managedcluster {primary_cluster_name}")
 
     # Verify old primary cluster is dettached
-    # Todo
+    expected_output = primary_cluster_name
+    out = run_cmd(cmd=f"oc get managedcluster {primary_cluster_name}")
+    if expected_output not in out:
+        raise Exception("Old primary cluster is not dettached.")
 
     # Import Recovery cluster
     cluster_name_recoevry = import_recovery_clusters_with_acm()

tests/functional/disaster-recovery/metro-dr/test_replace_cluster.py

@@ -101,8 +101,6 @@ def test_replace_cluster(
                 down_cluster_name=self.primary_cluster_name,
                 expected_text="Unknown",
             )
-        elif config.RUN.get("mdr_failover_via_ui"):
-            check_cluster_status_on_acm_console(acm_obj)
 
         # Fenced the primary managed cluster
         enable_fence(drcluster_name=self.primary_cluster_name)