fix metrices test for 2.22 and more duplicate test

Signed-off-by: Milind Waykole <mwaykole@redhat.com>

Author: mwaykole

tests/model_serving/model_server/metrics/test_model_metrics.py

@@ -9,7 +9,7 @@
     ModelFormat,
     ModelVersion,
     Protocols,
-    RuntimeTemplates,
+    RunTimeConfigs,
 )
 from utilities.inference_utils import Inference
 from utilities.manifests.onnx import ONNX_INFERENCE_CONFIG
@@ -24,16 +24,11 @@
 
 @pytest.mark.serverless
 @pytest.mark.parametrize(
-    "unprivileged_model_namespace, serving_runtime_from_template, s3_models_inference_service",
+    "unprivileged_model_namespace, ovms_kserve_serving_runtime, ovms_kserve_inference_service",
     [
         pytest.param(
             {"name": "kserve-ovms-metrics"},
-            {
-                "name": f"{Protocols.HTTP}-{ModelFormat.ONNX}",
-                "template-name": RuntimeTemplates.OVMS_KSERVE,
-                "multi-model": False,
-                "enable-http": True,
-            },
+            RunTimeConfigs.ONNX_OPSET13_RUNTIME_CONFIG,
             {
                 "name": f"{Protocols.HTTP}-{ModelFormat.ONNX}",
                 "deployment-mode": KServeDeploymentType.SERVERLESS,
@@ -47,10 +42,10 @@
 class TestModelMetrics:
     @pytest.mark.smoke
     @pytest.mark.polarion("ODS-2555")
-    def test_model_metrics_num_success_requests(self, s3_models_inference_service, prometheus):
+    def test_model_metrics_num_success_requests(self, ovms_kserve_inference_service, prometheus):
         """Verify number of successful model requests in OpenShift monitoring system (UserWorkloadMonitoring) metrics"""
         verify_inference_response(
-            inference_service=s3_models_inference_service,
+            inference_service=ovms_kserve_inference_service,
             inference_config=ONNX_INFERENCE_CONFIG,
             inference_type=Inference.INFER,
             protocol=Protocols.HTTPS,
@@ -64,12 +59,12 @@ def test_model_metrics_num_success_requests(self, s3_models_inference_service, p
 
     @pytest.mark.smoke
     @pytest.mark.polarion("ODS-2555")
-    def test_model_metrics_num_total_requests(self, s3_models_inference_service, prometheus):
+    def test_model_metrics_num_total_requests(self, ovms_kserve_inference_service, prometheus):
         """Verify number of total model requests in OpenShift monitoring system (UserWorkloadMonitoring) metrics"""
         total_runs = 5
 
         run_inference_multiple_times(
-            isvc=s3_models_inference_service,
+            isvc=ovms_kserve_inference_service,
             inference_config=ONNX_INFERENCE_CONFIG,
             inference_type=Inference.INFER,
             protocol=Protocols.HTTPS,
@@ -84,9 +79,9 @@ def test_model_metrics_num_total_requests(self, s3_models_inference_service, pro
 
     @pytest.mark.smoke
     @pytest.mark.polarion("ODS-2555")
-    def test_model_metrics_cpu_utilization(self, s3_models_inference_service, prometheus):
+    def test_model_metrics_cpu_utilization(self, ovms_kserve_inference_service, prometheus):
         """Verify CPU utilization data in OpenShift monitoring system (UserWorkloadMonitoring) metrics"""
         assert get_metrics_value(
             prometheus=prometheus,
-            metrics_query=f"pod:container_cpu_usage:sum{{namespace='{s3_models_inference_service.namespace}'}}",
+            metrics_query=f"pod:container_cpu_usage:sum{{namespace='{ovms_kserve_inference_service.namespace}'}}",
         )

tests/model_serving/model_server/metrics/test_non_admin_users.py

@@ -1,39 +1,12 @@
 import pytest
 
-from tests.model_serving.model_server.utils import (
-    run_inference_multiple_times,
-    verify_inference_response,
-)
+from tests.model_serving.model_server.utils import run_inference_multiple_times
 from utilities.constants import Protocols
 from utilities.inference_utils import Inference
 from utilities.manifests.onnx import ONNX_INFERENCE_CONFIG
 from utilities.monitoring import validate_metrics_field
 
 
-@pytest.mark.parametrize(
-    "unprivileged_model_namespace",
-    [
-        pytest.param(
-            {"name": "non-admin-serverless"},
-        )
-    ],
-    indirect=True,
-)
-@pytest.mark.smoke
-@pytest.mark.serverless
-class TestServerlessUnprivilegedUser:
-    @pytest.mark.polarion("ODS-2552")
-    def test_non_admin_deploy_serverless_and_query_metrics(self, unprivileged_ovms_serverless_inference_service):
-        """Verify non admin can deploy a model and query using REST"""
-        verify_inference_response(
-            inference_service=unprivileged_ovms_serverless_inference_service,
-            inference_config=ONNX_INFERENCE_CONFIG,
-            inference_type=Inference.INFER,
-            protocol=Protocols.HTTPS,
-            use_default_query=True,
-        )
-
-
 @pytest.mark.parametrize(
     "unprivileged_model_namespace",
     [