From f5c78fb72eecd27f3e69351ab1b9a3309c38fe6a Mon Sep 17 00:00:00 2001
From: Mahesh Shetty <mashetty@Maheshs-MacBook-Pro.local>
Date: Thu, 19 Sep 2024 11:11:21 +0530
Subject: [PATCH] Stretch cluster test minor changes

Signed-off-by: Mahesh Shetty <mashetty@Maheshs-MacBook-Pro.local>
---
 ocs_ci/deployment/cnv.py                            |  2 +-
 ocs_ci/ocs/resources/stretchcluster.py              |  2 +-
 .../disaster-recovery/sc_arbiter/test_netsplit.py   | 13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ocs_ci/deployment/cnv.py b/ocs_ci/deployment/cnv.py
index 03eeeb0c439..0ec6d51c191 100644
--- a/ocs_ci/deployment/cnv.py
+++ b/ocs_ci/deployment/cnv.py
@@ -628,7 +628,7 @@ def deploy_cnv(self, check_cnv_deployed=False, check_cnv_ready=False):
         # Enable software emulation
         self.enable_software_emulation()
         # Download and extract the virtctl binary to bin_dir
-        self.download_and_extract_virtctl_binary()
+        # self.download_and_extract_virtctl_binary()
 
     def disable_multicluster_engine(self):
         """
diff --git a/ocs_ci/ocs/resources/stretchcluster.py b/ocs_ci/ocs/resources/stretchcluster.py
index 91273f8a5ff..e83a9f531b3 100644
--- a/ocs_ci/ocs/resources/stretchcluster.py
+++ b/ocs_ci/ocs/resources/stretchcluster.py
@@ -484,7 +484,7 @@ def get_out_of_quorum_nodes(self):
         # find out the mons in quorum
         ceph_tools_pod = pod.get_ceph_tools_pod()
 
-        @retry(CommandFailed, tries=10, delay=10)
+        @retry(CommandFailed, tries=8, delay=5)
         def _get_non_quorum_mons():
             """
             Get non quorum mon pods
diff --git a/tests/functional/disaster-recovery/sc_arbiter/test_netsplit.py b/tests/functional/disaster-recovery/sc_arbiter/test_netsplit.py
index 66d86011b43..daaf42b6907 100644
--- a/tests/functional/disaster-recovery/sc_arbiter/test_netsplit.py
+++ b/tests/functional/disaster-recovery/sc_arbiter/test_netsplit.py
@@ -3,7 +3,6 @@
 import time
 import ocpnetsplit
 
-from ocs_ci.utility.retry import retry
 from ocs_ci.framework.pytest_customization.marks import (
     turquoise_squad,
     tier1,
@@ -13,7 +12,7 @@
     recover_workload_pods_post_recovery,
     recover_from_ceph_stuck,
 )
-from ocs_ci.ocs.exceptions import UnexpectedBehaviour, CommandFailed
+from ocs_ci.ocs.exceptions import UnexpectedBehaviour
 
 from ocs_ci.ocs.resources.stretchcluster import StretchCluster
 from ocs_ci.ocs.exceptions import CephHealthException
@@ -119,10 +118,10 @@ def finalizer():
             ),
         ],
         ids=[
-            "Data-1-Data-2",
-            "Arbiter-Data-1",
+            # "Data-1-Data-2",
+            # "Arbiter-Data-1",
             "Arbiter-Data-1-and-Arbiter-Data-2",
-            "Arbiter-Data-1-and-Data-1-Data-2",
+            # "Arbiter-Data-1-and-Data-1-Data-2",
         ],
     )
     @pytest.mark.polarion_id("OCS-5850")
@@ -200,9 +199,9 @@ def test_netsplit(
         # out of quorum zone
         if (
             zones != constants.NETSPLIT_ARBITER_DATA_1
-            or zones != constants.NETSPLIT_ARBITER_DATA_1_AND_ARBITER_DATA_2
+            and zones != constants.NETSPLIT_ARBITER_DATA_1_AND_ARBITER_DATA_2
         ):
-            retry(CommandFailed, tries=5, delay=10)(sc_obj.get_out_of_quorum_nodes)()
+            sc_obj.get_out_of_quorum_nodes()
 
         # note the end time (UTC)
         if not sc_obj.check_ceph_accessibility(timeout=(duration * 60)):