Renamed client instead of dyn_client in wrapper resource get calls (#981)

modified:   tests/llama_stack/eval/conftest.py
	modified:   tests/llama_stack/eval/utils.py
	modified:   tests/model_explainability/guardrails/conftest.py
	modified:   tests/model_explainability/trustyai_service/service/utils.py
	modified:   tests/model_explainability/trustyai_service/trustyai_service_utils.py
	modified:   tests/model_explainability/trustyai_service/utils.py
	modified:   utilities/mariadb_utils.py

Author: kpunwatk

tests/llama_stack/eval/conftest.py

@@ -89,7 +89,7 @@ def teardown_lmeval_job_pod(admin_client, model_namespace) -> None:
     if pods := [
         pod
         for pod in Pod.get(
-            dyn_client=admin_client, namespace=model_namespace.name, label_selector="app.kubernetes.io/name=ta-lmes"
+            client=admin_client, namespace=model_namespace.name, label_selector="app.kubernetes.io/name=ta-lmes"
         )
     ]:
         for pod in pods:
@@ -198,7 +198,7 @@ def dspa_route(
     def _get_dspa_route() -> Route | None:
         routes = list(
             Route.get(
-                dyn_client=admin_client,
+                client=admin_client,
                 namespace=model_namespace.name,
                 name="ds-pipeline-dspa",
             )

tests/llama_stack/eval/utils.py

@@ -43,7 +43,7 @@ def wait_for_dspa_pods(admin_client: DynamicClient, namespace: str, dspa_name: s
     label_selector = f"dspa={dspa_name}"
 
     def _all_dspa_pods_running() -> bool:
-        pods = list(Pod.get(dyn_client=admin_client, namespace=namespace, label_selector=label_selector))
+        pods = list(Pod.get(client=admin_client, namespace=namespace, label_selector=label_selector))
         if not pods:
             return False
         return all(pod.instance.status.phase == Pod.Status.RUNNING for pod in pods)

tests/model_explainability/guardrails/conftest.py

@@ -405,7 +405,7 @@ def _get_pods() -> List[Pod]:
         return [
             pod
             for pod in Pod.get(
-                dyn_client=client,
+                client=client,
                 namespace=namespace,
                 label_selector=label_selector,
             )
@@ -543,7 +543,7 @@ def otelcol_metrics_endpoint(admin_client: DynamicClient, model_namespace: Names
 
     service = next(
         Service.get(
-            dyn_client=admin_client,
+            client=admin_client,
             namespace=model_namespace.name,
             label_selector="app.kubernetes.io/component=opentelemetry-collector",
         )

tests/model_explainability/trustyai_service/service/utils.py

@@ -14,7 +14,7 @@
 def wait_for_trustyai_db_migration_complete_log(client: DynamicClient, trustyai_service: TrustyAIService) -> bool:
     trustyai_pod = list(
         Pod.get(
-            dyn_client=client,
+            client=client,
             namespace=trustyai_service.namespace,
             label_selector=f"app.kubernetes.io/instance={trustyai_service.name}",
         )

tests/model_explainability/trustyai_service/trustyai_service_utils.py

@@ -363,7 +363,7 @@ def _get_deployments() -> list[Deployment]:
     def _get_pods() -> list[Pod]:
         return list(
             Pod.get(
-                dyn_client=client,
+                client=client,
                 namespace=isvc.namespace,
                 label_selector=pod_label_selector,
             )

tests/model_explainability/trustyai_service/utils.py

@@ -43,7 +43,7 @@ def _get_mariadb_pods() -> list[Pod]:
         _pods = [
             _pod
             for _pod in Pod.get(
-                dyn_client=client,
+                client=client,
                 namespace=mariadb.namespace,
                 label_selector=f"app.kubernetes.io/instance={mariadb.name}",
             )
@@ -92,7 +92,7 @@ def validate_trustyai_service_db_conn_failure(
         UnexpectedFailureError: if the pod failure is different from the expected failure mode.
 
     """
-    pods = list(Pod.get(dyn_client=client, namespace=namespace.name, label_selector=label_selector))
+    pods = list(Pod.get(client=client, namespace=namespace.name, label_selector=label_selector))
     mariadb_conn_failure_regex = (
         r"^.+ERROR.+Could not connect to mariadb:.+ PKIX path validation failed: "
         r"java\.security\.cert\.CertPathValidatorException: signature check failed"

utilities/mariadb_utils.py

@@ -13,7 +13,7 @@ def _get_mariadb_pods() -> list[Pod]:
         _pods = [
             _pod
             for _pod in Pod.get(
-                dyn_client=client,
+                client=client,
                 namespace=mariadb.namespace,
                 label_selector=f"app.kubernetes.io/instance={mariadb.name}",
             )