remove horizontalscale

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

Author: vkathole

tests/conftest.py

@@ -1509,7 +1509,6 @@ def factory(
         custom_data=None,
         node_name=None,
         node_selector=None,
-        project=None,
         replica_count=1,
         raw_block_pv=False,
         sa_obj=None,
@@ -1532,8 +1531,6 @@ def factory(
             node_name (str): The name of specific node to schedule the pod
             node_selector (dict): dict of key-value pair to be used for nodeSelector field
                 eg: {'nodetype': 'app-pod'}
-            project (object): ocs_ci.ocs.resources.ocs.OCS instance
-                of 'Project' kind.
             replica_count (int): Replica count for deployment config
             raw_block_pv (str): True if pod with raw block pvc
             sa_obj (object) : If specific service account is needed
@@ -1543,10 +1540,7 @@ def factory(
             dc_pod_obj = helpers.create_resource(**custom_data)
         else:
             pvc = pvc or pvc_factory(
-                interface=interface,
-                size=size,
-                access_mode=access_mode,
-                project=project,
+                interface=interface, size=size, access_mode=access_mode
             )
             sa_obj = sa_obj or service_account_factory(
                 project=pvc.project, service_account=service_account

tests/functional/monitoring/prometheus/alerts/test_alert_mds_cpu_high_usage.py

@@ -6,11 +6,8 @@
 from ocs_ci.framework.testlib import E2ETest, tier2
 from ocs_ci.helpers import helpers
 from ocs_ci.ocs import cluster, constants
-from ocs_ci.ocs.monitoring import get_prometheus_response
 from ocs_ci.utility import prometheus
 from ocs_ci.utility.utils import ceph_health_check_base
-from ocs_ci.framework import config
-from ocs_ci.ocs.ocp import OCP
 
 log = logging.getLogger(__name__)
 
@@ -30,18 +27,12 @@ def run_file_creator_io_with_cephfs(dc_pod_factory):
     interface = constants.CEPHFILESYSTEM
     log.info("Checking for Ceph Health OK")
     ceph_health_check_base()
-    ocp_project = OCP(
-        kind=constants.NAMESPACE, namespace=config.ENV_DATA["cluster_namespace"]
-    )
 
     for dc_pod in range(10):
         log.info(f"Creating {interface} based PVC")
         log.info("Creating fedora dc pod")
         pod_obj = dc_pod_factory(
-            size="15",
-            access_mode=access_mode,
-            interface=interface,
-            project=ocp_project,
+            size="15", access_mode=access_mode, interface=interface
         )
         log.info("Copying file_creator_io.py to fedora pod ")
         cmd = f"oc cp {file} {pod_obj.namespace}/{pod_obj.name}:/"
@@ -54,19 +45,6 @@ def run_file_creator_io_with_cephfs(dc_pod_factory):
         )
 
 
-def get_scaling_type(threading_lock):
-    api = prometheus.PrometheusAPI(threading_lock=threading_lock)
-    ceph_mds_request = get_prometheus_response(api, query="rate(ceph_mds_request[6h])")
-    result = ceph_mds_request["data"]["result"]
-    for item in result:
-        rate_ceph_mds_request = item["value"]
-        rate_ceph_mds_request = float(rate_ceph_mds_request[1])
-        if rate_ceph_mds_request >= 1000:
-            return "Horizontal"
-        else:
-            return "Vertical"
-
-
 def active_mds_alert_values(threading_lock):
     """
     This function validates the mds alerts using prometheus api
@@ -78,22 +56,15 @@ def active_mds_alert_values(threading_lock):
     api = prometheus.PrometheusAPI(threading_lock=threading_lock)
     alert_list = api.wait_for_alert(name=cpu_alert, state="pending")
     message = f"Ceph metadata server pod ({active_mds_pod}) has high cpu usage"
-
-    scaling_type = get_scaling_type(threading_lock)
-    if scaling_type == "Horizontal":
-        description_part = (
-            " and cannot cope up with the current rate of mds requests."
-            "\nPlease consider Horizontal scaling, by adding another MDS pod"
-        )
-    else:
-        description_part = ". Please consider Vertical scaling, by adding more resources to the existing MDS pod"
     description = (
-        f"Ceph metadata server pod ({active_mds_pod}) has high cpu usage {description_part}."
-        "\nPlease see 'runbook_url' for more details."
+        f"Ceph metadata server pod ({active_mds_pod}) has high cpu usage"
+        f"\n. Please consider Vertical "
+        f"\nscaling, by adding more resources to the existing MDS pod."
+        f"\nPlease see 'runbook_url' for more details."
     )
     runbook = (
-        "https://github.com/openshift/runbooks/blob/master/alerts/openshift-container-storage-operator"
-        f"/CephMdsCPUUsageHighNeeds{scaling_type}Scaling.md"
+        "https://github.com/openshift/runbooks/blob/master/alerts/"
+        "openshift-container-storage-operator/CephMdsCPUUsageHighNeedsVerticalScaling.md"
     )
     severity = "warning"
     state = ["pending"]
@@ -139,5 +110,4 @@ def test_alert_triggered(self, run_file_creator_io_with_cephfs, threading_lock):
             "File creation IO started in the background."
             " Script will look for MDSCPUUsageHigh  alert"
         )
-
         assert active_mds_alert_values(threading_lock)