Replace dyn_client with client in all get calls (#980)

Author: dbasunag

tests/model_registry/image_validation/conftest.py

@@ -31,4 +31,4 @@ def resource_pods(request: FixtureRequest, admin_client: DynamicClient) -> list[
     namespace = request.param.get("namespace")
     label_selector = request.param.get("label_selector")
     assert namespace
-    return list(Pod.get(namespace=namespace, label_selector=label_selector, dyn_client=admin_client))
+    return list(Pod.get(namespace=namespace, label_selector=label_selector, client=admin_client))

tests/model_registry/model_catalog/catalog_config/utils.py

@@ -22,7 +22,7 @@ def validate_model_catalog_enabled(pod: Pod) -> bool:
 def validate_model_catalog_resource(
     kind: Any, admin_client: DynamicClient, namespace: str, expected_resource_count: int
 ) -> None:
-    resource = list(kind.get(namespace=namespace, label_selector="component=model-catalog", dyn_client=admin_client))
+    resource = list(kind.get(namespace=namespace, label_selector="component=model-catalog", client=admin_client))
     assert resource
     LOGGER.info(f"Validating resource: {kind}: Found {len(resource)}")
     assert len(resource) == expected_resource_count, (

tests/model_registry/model_catalog/conftest.py

@@ -397,7 +397,7 @@ def catalog_config_map(admin_client: DynamicClient, model_registry_namespace: st
 @pytest.fixture(scope="class")
 def model_catalog_routes(admin_client: DynamicClient, model_registry_namespace: str) -> list[Route]:
     return list(
-        Route.get(namespace=model_registry_namespace, label_selector="component=model-catalog", dyn_client=admin_client)
+        Route.get(namespace=model_registry_namespace, label_selector="component=model-catalog", client=admin_client)
     )
 
 

tests/model_registry/model_catalog/utils.py

@@ -22,7 +22,7 @@ def get_catalog_url_and_headers(
     Get model catalog URL and authentication headers from route.
     """
     model_catalog_routes = list(
-        Route.get(namespace=model_registry_namespace, label_selector="component=model-catalog", dyn_client=admin_client)
+        Route.get(namespace=model_registry_namespace, label_selector="component=model-catalog", client=admin_client)
     )
     assert model_catalog_routes, f"Model catalog routes not found in namespace {model_registry_namespace}"
 

tests/model_registry/model_registry/async_job/utils.py

@@ -16,7 +16,7 @@ def get_latest_job_pod(admin_client: DynamicClient, job: Job) -> Pod:
     """Get the latest (most recently created) Pod created by a Job"""
     pods = list(
         Pod.get(
-            dyn_client=admin_client,
+            client=admin_client,
             namespace=job.namespace,
             label_selector=f"job-name={job.name}",
         )

tests/model_registry/model_registry/rest_api/test_model_registry_rest_api.py

@@ -158,7 +158,7 @@ def test_default_postgres_db_pod_log(
             f"{k}={v}" for k, v in model_registry_default_postgres_deployment_match_label.items()
         ])
         LOGGER.info(label_selector)
-        pods = list(Pod.get(dyn_client=admin_client, namespace=model_registry_namespace, label_selector=label_selector))
+        pods = list(Pod.get(client=admin_client, namespace=model_registry_namespace, label_selector=label_selector))
         assert pods, (
             "No pods found for default postgres deployment with "
             f"label: {model_registry_default_postgres_deployment_match_label}"

tests/model_registry/model_registry/rest_api/test_multiple_mr.py

@@ -59,7 +59,7 @@ def test_validate_one_model_catalog_configmap(
         """
         config_map_names: list[str] = []
         expected_number_config_maps: int = 2
-        for config_map in list(ConfigMap.get(namespace=model_registry_namespace, dyn_client=admin_client)):
+        for config_map in list(ConfigMap.get(namespace=model_registry_namespace, client=admin_client)):
             if config_map.name.startswith(tuple([DEFAULT_CUSTOM_MODEL_CATALOG, DEFAULT_MODEL_CATALOG_CM])):
                 config_map_names.append(config_map.name)
         assert len(config_map_names) == expected_number_config_maps, (

tests/model_registry/model_registry/rest_api/utils.py

@@ -265,4 +265,4 @@ def get_register_model_data(num_models: int) -> list[dict[str, Any]]:
 
 
 def get_mr_deployment(admin_client: DynamicClient, mr_namespace: str) -> list[Deployment]:
-    return list(Deployment.get(dyn_client=admin_client, namespace=mr_namespace))
+    return list(Deployment.get(client=admin_client, namespace=mr_namespace))

tests/model_registry/scc/utils.py

@@ -97,7 +97,7 @@ def get_pod_by_deployment_name(admin_client: DynamicClient, namespace: str, depl
     label_selector = ",".join([f"{k}={v}" for k, v in deployment_instance.spec.selector.matchLabels.items()])
     pods = list(
         Pod.get(
-            dyn_client=admin_client,
+            client=admin_client,
             namespace=namespace,
             label_selector=label_selector,
         )

tests/model_registry/utils.py

@@ -64,7 +64,7 @@ def get_mr_service_by_label(client: DynamicClient, namespace_name: str, mr_insta
     if svc := [
         svcs
         for svcs in Service.get(
-            dyn_client=client,
+            client=client,
             namespace=namespace_name,
             label_selector=f"app={mr_instance.name},component=model-registry",
         )
@@ -246,7 +246,7 @@ def wait_for_new_running_mr_pod(
     LOGGER.info("Waiting for pod to be replaced")
     pods = list(
         Pod.get(
-            dyn_client=admin_client,
+            client=admin_client,
             namespace=namespace,
             label_selector=MODEL_REGISTRY_POD_FILTER,
         )
@@ -663,7 +663,7 @@ def validate_mlmd_removal_in_model_registry_pod_log(
 def get_model_catalog_pod(
     client: DynamicClient, model_registry_namespace: str, label_selector: str = "app.kubernetes.io/name=model-catalog"
 ) -> list[Pod]:
-    return list(Pod.get(namespace=model_registry_namespace, label_selector=label_selector, dyn_client=client))
+    return list(Pod.get(namespace=model_registry_namespace, label_selector=label_selector, client=client))
 
 
 def get_rest_headers(token: str) -> dict[str, str]: