Incorperating Review Comments

Signed-off-by: suchita-g <[email protected]>
red-hat-storage · Nov 14, 2023 · 0e8b964 · 0e8b964
1 parent 7524037
commit 0e8b964
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/ocs_ci/framework/pytest_customization/marks.py b/ocs_ci/framework/pytest_customization/marks.py
@@ -26,6 +26,8 @@
     MANAGED_SERVICE_PLATFORMS,
     HPCS_KMS_PROVIDER,
     HCI_PROVIDER_CLIENT_PLATFORMS,
+    HCI_CLIENT,
+    HCI_PROVIDER,
 )
 from ocs_ci.utility import version
 from ocs_ci.utility.aws import update_config_from_s3
@@ -371,14 +373,14 @@
 skipif_hci_provider = pytest.mark.skipif(
     config.default_cluster_ctx.ENV_DATA["platform"].lower()
     in HCI_PROVIDER_CLIENT_PLATFORMS
-    and config.default_cluster_ctx.ENV_DATA["cluster_type"].lower() == "provider",
+    and config.default_cluster_ctx.ENV_DATA["cluster_type"].lower() == HCI_PROVIDER,
     reason="Test will not run on Fusion HCI provider cluster",
 )
 
 skipif_hci_client = pytest.mark.skipif(
     config.default_cluster_ctx.ENV_DATA["platform"].lower()
     in HCI_PROVIDER_CLIENT_PLATFORMS
-    and config.default_cluster_ctx.ENV_DATA["cluster_type"].lower() == "hci_client",
+    and config.default_cluster_ctx.ENV_DATA["cluster_type"].lower() == HCI_CLIENT,
     reason="Test will not run on Fusion HCI client cluster",
 )
 

diff --git a/ocs_ci/ocs/constants.py b/ocs_ci/ocs/constants.py
@@ -237,6 +237,10 @@
 MS_PROVIDER_TYPE = "provider"
 NON_MS_CLUSTER_TYPE = "non_ms"
 
+# HCI cluster types
+HCI_CLIENT = "hci_client"
+HCI_PROVIDER = "provider"
+
 OCP_QE_MISC_REPO = "https://gitlab.cee.redhat.com/aosqe/flexy-templates.git"
 CRITICAL_ERRORS = ["core dumped", "oom_reaper"]
 must_gather_pod_label = "app=must-gather"

diff --git a/tests/libtest/__init__.py b/tests/libtest/__init__.py
diff --git a/...ci_provider_client/test_hci_pc_markers.py → tests/libtest/test_hci_pc_markers.py b/...ci_provider_client/test_hci_pc_markers.py → tests/libtest/test_hci_pc_markers.py