fix: implement change from PR #339

Signed-off-by: lugi0 <lgiorgi@redhat.com>

Author: lugi0

tests/model_registry/conftest.py

@@ -213,22 +213,16 @@ def model_registry_instance_service(
 
 @pytest.fixture(scope="class")
 def model_registry_instance_rest_endpoint(
-    request: FixtureRequest,
+    model_registry_instance_service: Service,
 ) -> str:
     """
     Get the REST endpoint for the model registry instance.
     Args:
-        request: The pytest request object containing the service_fixture parameter
+        model_registry_instance_service: The service for the model registry instance
     Returns:
         str: The REST endpoint for the model registry instance
     """
-    # Get the service fixture name from the request
-    service_fixture = getattr(request, "param", {}).get("service_fixture", "model_registry_instance_service")
-
-    # Get the service from the fixture
-    service = request.getfixturevalue(argname=service_fixture)
-
-    return get_endpoint_from_mr_service(svc=service, protocol=Protocols.REST)
+    return get_endpoint_from_mr_service(svc=model_registry_instance_service, protocol=Protocols.REST)
 
 
 @pytest.fixture(scope="class")

tests/model_registry/rbac/test_mr_rbac_sa.py

@@ -12,7 +12,7 @@
 
 
 @pytest.mark.parametrize(
-    "updated_dsc_component_state_scope_class, model_registry_instance_rest_endpoint",
+    "updated_dsc_component_state_scope_class, is_model_registry_oauth",
     [
         pytest.param(
             {
@@ -23,8 +23,8 @@
                     },
                 }
             },
-            {"service_fixture": "model_registry_instance_service"},
-            id="standard_endpoint",
+            {"use_oauth_proxy": False},
+            id="servicemesh",
         ),
         pytest.param(
             {
@@ -35,14 +35,14 @@
                     },
                 }
             },
-            {"service_fixture": "model_registry_instance_oauth_service"},
-            id="oauth_endpoint",
+            {"use_oauth_proxy": True},
+            id="oauth",
         ),
     ],
     indirect=True,
     scope="class",
 )
-@pytest.mark.usefixtures("updated_dsc_component_state_scope_class")
+@pytest.mark.usefixtures("updated_dsc_component_state_scope_class", "is_model_registry_oauth")
 class TestModelRegistryRBAC:
     """
     Tests RBAC for Model Registry REST endpoint using ServiceAccount tokens.
@@ -63,9 +63,7 @@ def test_service_account_access_denied(
         """
         LOGGER.info("--- Starting RBAC Test: Access Denied ---")
         LOGGER.info(f"Targeting Model Registry REST endpoint: {model_registry_instance_rest_endpoint}")
-        LOGGER.info(
-            f"Using {'OAuth' if request.node.callspec.id == 'oauth_endpoint' else 'standard'} client configuration"
-        )
+        LOGGER.info(f"Using {'OAuth' if request.node.callspec.id == 'oauth' else 'servicemesh'} client configuration")
         LOGGER.info("Expecting initial access DENIAL (403 Forbidden)")
 
         client_args = build_mr_client_args(
@@ -98,9 +96,7 @@ def test_service_account_access_granted(
         """
         LOGGER.info("--- Starting RBAC Test: Access Granted ---")
         LOGGER.info(f"Targeting Model Registry REST endpoint: {model_registry_instance_rest_endpoint}")
-        LOGGER.info(
-            f"Using {'OAuth' if request.node.callspec.id == 'oauth_endpoint' else 'standard'} client configuration"
-        )
+        LOGGER.info(f"Using {'OAuth' if request.node.callspec.id == 'oauth' else 'servicemesh'} client configuration")
         LOGGER.info("Applied RBAC Role/Binding via fixtures. Expecting access GRANT.")
 
         try: