Adding skipif_hci_provider_and_client similar to skipif_managed_serv…

…ice (#8894) * Adding skipif_hci_provider_and_client similar to skipif_managed_service Signed-off-by: suchita-g <[email protected]> skipif_hci_provider_and_client is not applicable to nooba,mcg and obeject service test cases as this is supported in provider client solution * Update run_on_provider marker to run test on provider Signed-off-by: suchita-g <[email protected]> * Updating skip level by Removing skip for obc , nooba and mcg test case Signed-off-by: suchita-g <[email protected]> --------- Signed-off-by: suchita-g <[email protected]>
red-hat-storage · Dec 1, 2023 · 3acdf38 · 3acdf38
1 parent e73ff0c
commit 3acdf38
Show file tree

Hide file tree

Showing 27 changed files with 84 additions and 5 deletions.
diff --git a/tests/e2e/workloads/ocp/logging/test_openshift-logging.py b/tests/e2e/workloads/ocp/logging/test_openshift-logging.py
@@ -22,7 +22,10 @@
     ignore_leftovers,
 )
 from ocs_ci.utility import deployment_openshift_logging as ocp_logging_obj
-from ocs_ci.framework.pytest_customization.marks import skipif_managed_service
+from ocs_ci.framework.pytest_customization.marks import (
+    skipif_managed_service,
+    skipif_ms_provider_and_consumer,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -159,6 +162,7 @@ def check_filecount_in_project(self, project):
     @pytest.mark.polarion_id("OCS-657")
     @tier1
     @skipif_managed_service
+    @skipif_ms_provider_and_consumer
     def test_create_new_project_to_verify_logging(
         self, create_pvc_and_deploymentconfig_pod
     ):

diff --git a/tests/manage/monitoring/prometheus/test_capacity.py b/tests/manage/monitoring/prometheus/test_capacity.py
@@ -6,6 +6,7 @@
     tier2,
     gather_metrics_on_fail,
     skipif_managed_service,
+    runs_on_provider,
     blue_squad,
 )
 from ocs_ci.ocs import constants
@@ -23,6 +24,7 @@
     "ceph_cluster_total_used_bytes", "cluster:memory_usage_bytes:sum"
 )
 @skipif_managed_service
+@runs_on_provider
 def test_rbd_capacity_workload_alerts(
     workload_storageutilization_97p_rbd, threading_lock
 ):
@@ -90,6 +92,7 @@ def test_rbd_capacity_workload_alerts(
     "ceph_cluster_total_used_bytes", "cluster:memory_usage_bytes:sum"
 )
 @skipif_managed_service
+@runs_on_provider
 def test_cephfs_capacity_workload_alerts(
     workload_storageutilization_97p_cephfs, threading_lock
 ):

diff --git a/tests/manage/monitoring/prometheus/test_ceph.py b/tests/manage/monitoring/prometheus/test_ceph.py
@@ -1,7 +1,13 @@
 import logging
 import pytest
 
-from ocs_ci.framework.testlib import tier4, tier4a, skipif_managed_service, blue_squad
+from ocs_ci.framework.testlib import (
+    tier4,
+    tier4a,
+    skipif_managed_service,
+    runs_on_provider,
+    blue_squad,
+)
 from ocs_ci.ocs import constants
 from ocs_ci.utility import prometheus
 from ocs_ci.ocs.ocp import OCP
@@ -14,6 +20,7 @@
 @tier4a
 @pytest.mark.polarion_id("OCS-903")
 @skipif_managed_service
+@runs_on_provider
 def test_corrupt_pg_alerts(measure_corrupt_pg, threading_lock):
     """
     Test that there are appropriate alerts when Placement group
@@ -60,6 +67,7 @@ def test_corrupt_pg_alerts(measure_corrupt_pg, threading_lock):
 @tier4a
 @pytest.mark.polarion_id("OCS-898")
 @skipif_managed_service
+@runs_on_provider
 def test_ceph_health(measure_stop_ceph_osd, measure_corrupt_pg, threading_lock):
     """
     Test that there are appropriate alerts for Ceph health triggered.

diff --git a/tests/manage/monitoring/prometheus/test_deployment_status.py b/tests/manage/monitoring/prometheus/test_deployment_status.py
@@ -6,6 +6,7 @@
     tier4c,
     bugzilla,
     skipif_managed_service,
+    runs_on_provider,
     skipif_ocs_version,
 )
 from ocs_ci.ocs import constants
@@ -20,6 +21,7 @@
 @tier4c
 @pytest.mark.polarion_id("OCS-1052")
 @skipif_managed_service
+@runs_on_provider
 def test_ceph_manager_stopped(measure_stop_ceph_mgr, threading_lock):
     """
     Test that there is appropriate alert when ceph manager
@@ -50,6 +52,7 @@ def test_ceph_manager_stopped(measure_stop_ceph_mgr, threading_lock):
 @tier4c
 @pytest.mark.polarion_id("OCS-904")
 @skipif_managed_service
+@runs_on_provider
 def test_ceph_monitor_stopped(measure_stop_ceph_mon, threading_lock):
     """
     Test that there is appropriate alert related to ceph monitor quorum
@@ -92,6 +95,7 @@ def test_ceph_monitor_stopped(measure_stop_ceph_mon, threading_lock):
 @pytest.mark.polarion_id("OCS-2724")
 @pytest.mark.parametrize("create_mon_quorum_loss", [True])
 @skipif_managed_service
+@runs_on_provider
 @skipif_ocs_version("<4.9")
 def test_ceph_mons_quorum_lost(measure_stop_ceph_mon, threading_lock):
     """
@@ -122,6 +126,7 @@ def test_ceph_mons_quorum_lost(measure_stop_ceph_mon, threading_lock):
 @tier4c
 @pytest.mark.polarion_id("OCS-900")
 @skipif_managed_service
+@runs_on_provider
 def test_ceph_osd_stopped(measure_stop_ceph_osd, threading_lock):
     """
     Test that there is appropriate alert related to situation when ceph osd

diff --git a/tests/manage/monitoring/prometheusmetrics/test_rgw.py b/tests/manage/monitoring/prometheusmetrics/test_rgw.py
@@ -10,7 +10,12 @@
 
 from ocs_ci.framework import config
 from ocs_ci.framework.pytest_customization.marks import blue_squad
-from ocs_ci.framework.testlib import skipif_managed_service, skipif_ocs_version, tier4c
+from ocs_ci.framework.testlib import (
+    skipif_managed_service,
+    runs_on_provider,
+    skipif_ocs_version,
+    tier4c,
+)
 from ocs_ci.ocs import constants, ocp
 from ocs_ci.ocs import metrics
 from ocs_ci.ocs.resources.ocs import OCS
@@ -25,6 +30,7 @@
 @tier4c
 @pytest.mark.polarion_id("OCS-2385")
 @skipif_managed_service
+@runs_on_provider
 def test_ceph_rgw_metrics_after_metrics_exporter_respin(
     rgw_deployments, threading_lock
 ):

diff --git a/tests/manage/pv_services/pvc_snapshot/test_restore_snapshot_using_different_sc.py b/tests/manage/pv_services/pvc_snapshot/test_restore_snapshot_using_different_sc.py
@@ -9,6 +9,7 @@
     tier1,
     skipif_ocp_version,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
 )
 from ocs_ci.ocs.resources.pod import cal_md5sum, verify_data_integrity
 from ocs_ci.helpers.helpers import (
@@ -23,6 +24,7 @@
 @green_squad
 @tier1
 @skipif_managed_service
+@skipif_hci_provider_and_client
 @skipif_ocs_version("<4.6")
 @skipif_ocp_version("<4.6")
 @pytest.mark.polarion_id("OCS-2424")

diff --git a/tests/manage/pv_services/test_daemon_kill_during_pvc_pod_creation_deletion_and_io.py b/tests/manage/pv_services/test_daemon_kill_during_pvc_pod_creation_deletion_and_io.py
@@ -13,6 +13,7 @@
     tier4c,
     polarion_id,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
     skipif_external_mode,
     ignore_leftover_label,
 )
@@ -43,6 +44,7 @@
 @tier4
 @tier4c
 @skipif_managed_service
+@skipif_hci_provider_and_client
 @skipif_external_mode
 @ignore_leftover_label(constants.ROOK_CEPH_DETECT_VERSION_LABEL)
 class TestDaemonKillDuringMultipleCreateDeleteOperations(ManageTest):

diff --git a/tests/manage/pv_services/test_overprovision_level_policy_control.py b/tests/manage/pv_services/test_overprovision_level_policy_control.py
@@ -15,6 +15,7 @@
     bugzilla,
     skipif_ocs_version,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
     skipif_external_mode,
 )
 
@@ -42,6 +43,7 @@ def setup_sc(storageclass_factory_class):
 @bugzilla("2024545")
 @skipif_external_mode
 @skipif_managed_service
+@skipif_hci_provider_and_client
 @skipif_ocs_version("<4.10")
 @pytest.mark.polarion_id("OCS-4472")
 class TestOverProvisionLevelPolicyControl(ManageTest):

diff --git a/tests/manage/pv_services/test_overprovision_level_policy_control_with_capacity.py b/tests/manage/pv_services/test_overprovision_level_policy_control_with_capacity.py
@@ -9,6 +9,7 @@
     ManageTest,
     tier1,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
     skipif_external_mode,
 )
 from ocs_ci.utility import version
@@ -34,6 +35,7 @@ def setup_sc(storageclass_factory_class):
 @pytest.mark.polarion_id("OCS-3778")
 @skipif_external_mode
 @skipif_managed_service
+@skipif_hci_provider_and_client
 class TestOverProvisionLevelPolicyControlWithCapacity(ManageTest):
     """
     Test OverProvision Level Policy Control With Capacity.

diff --git a/tests/manage/z_cluster/cluster_expansion/test_add_capacity.py b/tests/manage/z_cluster/cluster_expansion/test_add_capacity.py
@@ -13,6 +13,7 @@
     skipif_no_lso,
     skipif_lso,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
     brown_squad,
 )
 from ocs_ci.framework.testlib import (
@@ -122,6 +123,7 @@ def add_capacity_test(ui_flag=False):
 @skipif_external_mode
 @skipif_ibm_power
 @skipif_managed_service
+@skipif_hci_provider_and_client
 class TestAddCapacity(ManageTest):
     """
     Automates adding variable capacity to the cluster
@@ -146,13 +148,13 @@ def test_add_capacity_ui(self, reduce_and_resume_cluster_load):
 @ignore_leftovers
 @polarion_id("OCS-4647")
 @pytest.mark.second_to_last
-@skipif_managed_service
 @skipif_aws_i3
 @skipif_bm
 @skipif_bmpsi
 @skipif_external_mode
 @skipif_ibm_power
 @skipif_managed_service
+@skipif_hci_provider_and_client
 @skipif_no_lso
 class TestAddCapacityLSO(ManageTest):
     """
@@ -184,6 +186,7 @@ def test_add_capacity_lso_ui(self, reduce_and_resume_cluster_load):
 @skipif_external_mode
 @cloud_platform_required
 @skipif_managed_service
+@skipif_hci_provider_and_client
 class TestAddCapacityPreUpgrade(ManageTest):
     """
     Automates adding variable capacity to the cluster pre upgrade

diff --git a/tests/manage/z_cluster/cluster_expansion/test_add_capacity_entry_exit_criteria.py b/tests/manage/z_cluster/cluster_expansion/test_add_capacity_entry_exit_criteria.py
@@ -13,6 +13,7 @@
     skipif_bm,
     skipif_external_mode,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
 )
 from ocs_ci.helpers import cluster_exp_helpers
 from ocs_ci.ocs import constants
@@ -43,6 +44,7 @@
 @skipif_bm
 @skipif_external_mode
 @skipif_managed_service
+@skipif_hci_provider_and_client
 class TestAddCapacity(ManageTest):
     @pytest.fixture(autouse=True)
     def setup(self):

diff --git a/tests/manage/z_cluster/cluster_expansion/test_add_capacity_with_node_restart.py b/tests/manage/z_cluster/cluster_expansion/test_add_capacity_with_node_restart.py
@@ -7,6 +7,7 @@
     ManageTest,
     tier4b,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
 )
 from ocs_ci.framework import config
 from ocs_ci.ocs import constants
@@ -37,6 +38,7 @@
 @ignore_leftovers
 @tier4b
 @skipif_managed_service
+@skipif_hci_provider_and_client
 class TestAddCapacityNodeRestart(ManageTest):
     """
     Test add capacity when one of the worker nodes got restart

diff --git a/...cluster/cluster_expansion/test_crashcollector_pod_existence_on_ceph_pods_running_nodes.py b/...cluster/cluster_expansion/test_crashcollector_pod_existence_on_ceph_pods_running_nodes.py
@@ -3,6 +3,7 @@
 
 from ocs_ci.framework.pytest_customization.marks import (
     skipif_managed_service,
+    skipif_hci_provider_and_client,
     skipif_bm,
     brown_squad,
 )
@@ -39,6 +40,7 @@
 @skipif_bm
 @skipif_external_mode
 @skipif_managed_service
+@skipif_hci_provider_and_client
 @pytest.mark.polarion_id("OCS-2594")
 class TestAddNodeCrashCollector(ManageTest):
     """

diff --git a/tests/manage/z_cluster/cluster_expansion/test_delete_pod.py b/tests/manage/z_cluster/cluster_expansion/test_delete_pod.py
@@ -3,7 +3,12 @@
 import logging
 from concurrent.futures import ThreadPoolExecutor
 
-from ocs_ci.framework.testlib import ignore_leftovers, tier4c, skipif_managed_service
+from ocs_ci.framework.testlib import (
+    ignore_leftovers,
+    tier4c,
+    skipif_managed_service,
+    skipif_hci_provider_and_client,
+)
 from ocs_ci.framework.pytest_customization.marks import (
     skipif_external_mode,
     brown_squad,
@@ -26,6 +31,7 @@
 
 @brown_squad
 @skipif_managed_service
+@skipif_hci_provider_and_client
 @skipif_external_mode
 @ignore_leftovers
 @tier4c

diff --git a/tests/manage/z_cluster/cluster_expansion/test_node_expansion.py b/tests/manage/z_cluster/cluster_expansion/test_node_expansion.py
@@ -6,6 +6,7 @@
     skipif_flexy_deployment,
     skipif_ibm_flash,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
     brown_squad,
 )
 
@@ -15,6 +16,7 @@
 @brown_squad
 # https://github.com/red-hat-storage/ocs-ci/issues/4802
 @skipif_managed_service
+@skipif_hci_provider_and_client
 @skipif_flexy_deployment
 @skipif_ibm_flash
 @ignore_leftovers

diff --git a/tests/manage/z_cluster/cluster_expansion/test_verify_ceph_csidriver_runs_on_non_ocs_nodes.py b/tests/manage/z_cluster/cluster_expansion/test_verify_ceph_csidriver_runs_on_non_ocs_nodes.py
@@ -5,6 +5,7 @@
 from ocs_ci.framework.pytest_customization.marks import (
     skipif_flexy_deployment,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
     skipif_multus_enabled,
     brown_squad,
 )
@@ -19,6 +20,7 @@
 # https://github.com/red-hat-storage/ocs-ci/issues/4802
 @skipif_flexy_deployment
 @skipif_managed_service
+@skipif_hci_provider_and_client
 @skipif_multus_enabled
 @tier2
 @pytest.mark.polarion_id("OCS-2490")

diff --git a/tests/manage/z_cluster/nodes/test_check_pod_status_after_two_nodes_shutdown_recovery.py b/tests/manage/z_cluster/nodes/test_check_pod_status_after_two_nodes_shutdown_recovery.py
@@ -9,6 +9,7 @@
     ignore_leftovers,
     skipif_ibm_cloud,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
     skipif_external_mode,
 )
 from ocs_ci.helpers.sanity_helpers import Sanity
@@ -42,6 +43,7 @@ def init_sanity(self):
     @pytest.mark.polarion_id("OCS-2315")
     @skipif_ibm_cloud
     @skipif_managed_service
+    @skipif_hci_provider_and_client
     @skipif_external_mode
     @pytest.mark.bugzilla("2232106")
     def test_check_pod_status_after_two_nodes_shutdown_recovery(

diff --git a/tests/manage/z_cluster/nodes/test_check_pods_status_after_node_failure.py b/tests/manage/z_cluster/nodes/test_check_pods_status_after_node_failure.py
@@ -9,6 +9,7 @@
     ignore_leftovers,
     skipif_ibm_cloud,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
     skipif_external_mode,
 )
 from ocs_ci.helpers.sanity_helpers import Sanity
@@ -81,6 +82,7 @@ def wait_for_change_in_rook_ceph_pods(node_name, timeout=300, sleep=20):
 @ignore_leftovers
 @tier4a
 @skipif_managed_service
+@skipif_hci_provider_and_client
 @skipif_external_mode
 @pytest.mark.polarion_id("OCS-2552")
 class TestCheckPodsAfterNodeFailure(ManageTest):

diff --git a/tests/manage/z_cluster/nodes/test_disk_failures.py b/tests/manage/z_cluster/nodes/test_disk_failures.py
@@ -14,6 +14,7 @@
     skipif_ibm_cloud,
     skipif_external_mode,
     skipif_managed_service,
+    skipif_hci_provider_and_client,
 )
 from ocs_ci.helpers.sanity_helpers import Sanity
 from ocs_ci.helpers.helpers import (
@@ -130,6 +131,7 @@ def init_sanity(self):
         self.sanity_helpers = Sanity()
 
     @skipif_managed_service
+    @skipif_hci_provider_and_client
     @cloud_platform_required
     @pytest.mark.polarion_id("OCS-1085")
     @bugzilla("1825675")
@@ -178,6 +180,7 @@ def test_detach_attach_worker_volume(
         self.sanity_helpers.health_check(tries=100)
 
     @skipif_managed_service
+    @skipif_hci_provider_and_client
     @cloud_platform_required
     @pytest.mark.polarion_id("OCS-1086")
     @skipif_ibm_cloud