[MR updates] use client arg for resource calls - rest of the tests

Author: dbasunag

tests/model_registry/model_catalog/conftest.py

@@ -44,7 +44,7 @@ def enabled_model_catalog_config_map(
     admin_client: DynamicClient,
     model_registry_namespace: str,
     current_client_token: str,
-) -> ConfigMap:
+) -> Generator[ConfigMap, None, None]:
     """
     Enable all catalogs in the default model catalog configmap
     """

tests/model_registry/model_registry/negative_tests/conftest.py

@@ -119,6 +119,7 @@ def model_registry_db_deployment_negative_test(
     model_registry_db_service_for_negative_tests: Service,
 ) -> Generator[Deployment, Any, Any]:
     with Deployment(
+        client=admin_client,
         name=DB_RESOURCES_NAME_NEGATIVE,
         namespace=model_registry_namespace_for_negative_tests.name,
         annotations={
@@ -168,9 +169,9 @@ def model_registry_db_instance_pod(admin_client: DynamicClient) -> Generator[Pod
 
 
 @pytest.fixture()
-def delete_mr_deployment() -> None:
+def delete_mr_deployment(admin_client: DynamicClient) -> None:
     """Delete the model registry deployment"""
     mr_deployment = Deployment(
-        name=MR_INSTANCE_NAME, namespace=py_config["model_registry_namespace"], ensure_exists=True
+        client=admin_client, name=MR_INSTANCE_NAME, namespace=py_config["model_registry_namespace"], ensure_exists=True
     )
     mr_deployment.delete(wait=True)

tests/model_registry/model_registry/negative_tests/test_model_registry_creation_negative.py

@@ -14,6 +14,7 @@
     DB_RESOURCE_NAME,
 )
 from kubernetes.dynamic.exceptions import ForbiddenError
+from kubernetes.dynamic import DynamicClient
 
 
 LOGGER = get_logger(name=__name__)
@@ -30,6 +31,7 @@ class TestModelRegistryCreationNegative:
     @pytest.mark.sanity
     def test_registering_model_negative(
         self: Self,
+        admin_client: DynamicClient,
         current_client_token: str,
         model_registry_namespace_for_negative_tests: Namespace,
         updated_dsc_component_state_scope_session: DataScienceCluster,
@@ -50,6 +52,7 @@ def test_registering_model_negative(
             match=f"namespace must be {py_config['model_registry_namespace']}",
         ):
             with ModelRegistry(
+                client=admin_client,
                 name=MR_INSTANCE_NAME,
                 namespace=model_registry_namespace_for_negative_tests.name,
                 label={

tests/model_registry/model_registry/rbac/conftest.py

@@ -139,13 +139,16 @@ def created_role_binding_user(
 # RESOURCE FIXTURES PARMETRIZED
 # =============================================================================
 @pytest.fixture(scope="class")
-def db_secret_parametrized(request: FixtureRequest, teardown_resources: bool) -> Generator[List[Secret], Any, Any]:
+def db_secret_parametrized(
+    request: FixtureRequest, admin_client: DynamicClient, teardown_resources: bool
+) -> Generator[List[Secret], Any, Any]:
     """Create DB Secret parametrized"""
     with ExitStack() as stack:
         secrets = [
             stack.enter_context(
                 Secret(
                     **param,
+                    client=admin_client,
                     teardown=teardown_resources,
                 )
             )
@@ -156,14 +159,15 @@ def db_secret_parametrized(request: FixtureRequest, teardown_resources: bool) ->
 
 @pytest.fixture(scope="class")
 def db_pvc_parametrized(
-    request: FixtureRequest, teardown_resources: bool
+    request: FixtureRequest, admin_client: DynamicClient, teardown_resources: bool
 ) -> Generator[List[PersistentVolumeClaim], Any, Any]:
     """Create DB PVC parametrized"""
     with ExitStack() as stack:
         pvc = [
             stack.enter_context(
                 PersistentVolumeClaim(
                     **param,
+                    client=admin_client,
                     teardown=teardown_resources,
                 )
             )
@@ -173,13 +177,16 @@ def db_pvc_parametrized(
 
 
 @pytest.fixture(scope="class")
-def db_service_parametrized(request: FixtureRequest, teardown_resources: bool) -> Generator[List[Service], Any, Any]:
+def db_service_parametrized(
+    request: FixtureRequest, admin_client: DynamicClient, teardown_resources: bool
+) -> Generator[List[Service], Any, Any]:
     """Create DB Service parametrized"""
     with ExitStack() as stack:
         services = [
             stack.enter_context(
                 Service(
                     **param,
+                    client=admin_client,
                     teardown=teardown_resources,
                 )
             )
@@ -190,14 +197,15 @@ def db_service_parametrized(request: FixtureRequest, teardown_resources: bool) -
 
 @pytest.fixture(scope="class")
 def db_deployment_parametrized(
-    request: FixtureRequest, teardown_resources: bool
+    request: FixtureRequest, admin_client: DynamicClient, teardown_resources: bool
 ) -> Generator[List[Deployment], Any, Any]:
     """Create DB Deployment parametrized"""
     with ExitStack() as stack:
         deployments = [
             stack.enter_context(
                 Deployment(
                     **param,
+                    client=admin_client,
                     teardown=teardown_resources,
                 )
             )
@@ -217,7 +225,7 @@ def model_registry_instance_parametrized(
     """Create Model Registry instance parametrized"""
     with ExitStack() as stack:
         model_registry_instances = []
-        mr_instances = [stack.enter_context(ModelRegistry(**param)) for param in request.param]
+        mr_instances = [stack.enter_context(ModelRegistry(**param, client=admin_client)) for param in request.param]
         for mr_instance in mr_instances:
             # Common parameters for both ModelRegistry classes
             mr_instance.wait_for_condition(condition="Available", status="True")

tests/model_registry/model_registry/rest_api/conftest.py

@@ -155,6 +155,7 @@ def deploy_secure_mysql_and_mr(
     if "sslRootCertificateConfigMap" in param:
         mysql["sslRootCertificateConfigMap"] = param["sslRootCertificateConfigMap"]
     with ModelRegistry(
+        client=admin_client,
         name=SECURE_MR_NAME,
         namespace=model_registry_namespace,
         label=get_mr_standard_labels(resource_name=SECURE_MR_NAME),
@@ -361,12 +362,15 @@ def skip_if_not_default_db(request):
 
 @pytest.fixture()
 def model_registry_default_postgres_deployment_match_label(
-    model_registry_namespace: str, model_registry_instance: list[ModelRegistry]
+    model_registry_namespace: str, admin_client: DynamicClient, model_registry_instance: list[ModelRegistry]
 ) -> dict[str, str]:
     """
     Returns the matchLabels from the default postgres deployment for filtering pods.
     """
     deployment = Deployment(
-        namespace=model_registry_namespace, name=f"{model_registry_instance[0].name}-postgres", ensure_exists=True
+        client=admin_client,
+        namespace=model_registry_namespace,
+        name=f"{model_registry_instance[0].name}-postgres",
+        ensure_exists=True,
     )
     return deployment.instance.spec.selector.matchLabels

tests/model_registry/model_registry/rest_api/test_model_registry_rest_api.py

@@ -168,9 +168,11 @@ def test_default_postgres_db_pod_log(
 
     def test_model_registry_validate_api_version(
         self: Self,
-        model_registry_instance,
+        admin_client: DynamicClient,
+        model_registry_instance: list[ModelRegistry],
     ):
         api_version = ModelRegistry(
+            client=admin_client,
             name=model_registry_instance[0].name,
             namespace=model_registry_instance[0].namespace,
             ensure_exists=True,
@@ -181,7 +183,7 @@ def test_model_registry_validate_api_version(
 
     def test_model_registry_validate_kuberbacproxy_enabled(
         self: Self,
-        model_registry_instance,
+        model_registry_instance: list[ModelRegistry],
     ):
         model_registry_instance_spec = model_registry_instance[0].instance.spec
         LOGGER.info(f"Validating that MR is using kubeRBAC proxy {model_registry_instance_spec}")

tests/model_registry/model_registry/rest_api/test_multiple_mr.py

@@ -42,11 +42,17 @@
 class TestModelRegistryMultipleInstances:
     @pytest.mark.smoke
     def test_validate_multiple_model_registry(
-        self: Self, model_registry_instance: list[ModelRegistry], model_registry_namespace: str
+        self: Self,
+        admin_client: DynamicClient,
+        model_registry_instance: list[ModelRegistry],
+        model_registry_namespace: str,
     ):
         for num in range(0, NUM_RESOURCES["num_resources"]):
             mr = ModelRegistry(
-                name=f"{MR_INSTANCE_BASE_NAME}{num}", namespace=model_registry_namespace, ensure_exists=True
+                client=admin_client,
+                name=f"{MR_INSTANCE_BASE_NAME}{num}",
+                namespace=model_registry_namespace,
+                ensure_exists=True,
             )
             LOGGER.info(f"{mr.name} found")