Replace dyn_client with client to align with ocp wrapper change (#3286)

##### Short description:
As part of the change in
RedHatQE/openshift-python-wrapper#2623,
`dyn_client` arg is going to be replaced with `client` to be consistant
with the arg name in all places.

##### More details:

##### What this PR does / why we need it:

##### Which issue(s) this PR fixes:

##### Special notes for reviewer:

##### jira-ticket:
<!-- full-ticket-url needs to be provided. This would add a link to the
pull request to the jira and close it when the pull request is merged
If the task is not tracked by a Jira ticket, just write "NONE".
-->


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

# Release Notes

* **Refactor**
* Standardized internal parameter naming across resource retrieval
methods for improved code consistency and maintainability.

<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Author: rnetser

tests/after_cluster_deploy_sanity/test_after_cluster_deploy_sanity.py

@@ -28,7 +28,7 @@
 def wait_for_terminating_pvc(admin_client):
     def _get_terminating_pvcs():
         terminating_pvcs = []
-        for pvc in PersistentVolumeClaim.get(dyn_client=admin_client):
+        for pvc in PersistentVolumeClaim.get(client=admin_client):
             if pvc.instance.status.phase == pvc.Status.TERMINATING:
                 terminating_pvcs.append(pvc.name)
         return terminating_pvcs
@@ -105,7 +105,7 @@ def test_boot_volume_health(
 def test_pvc_health(admin_client):
     not_bound = []
     is_terminating_pvcs = False
-    for pvc in PersistentVolumeClaim.get(dyn_client=admin_client):
+    for pvc in PersistentVolumeClaim.get(client=admin_client):
         pvc_instance = pvc.instance
         pvc_status = pvc_instance.status.phase
         LOGGER.info(f"PVC {pvc.name} is in {pvc_status} state")
@@ -128,7 +128,7 @@ def test_pvc_health(admin_client):
 def test_namespace_health(admin_client):
     if errored_namespaces := [
         f"{ns.name} found in status {ns.status}"
-        for ns in Namespace.get(dyn_client=admin_client)
+        for ns in Namespace.get(client=admin_client)
         if ns.exists and ns.status != Namespace.Status.ACTIVE
     ]:
         pytest.fail(f"{errored_namespaces} found in not active state")
@@ -143,7 +143,7 @@ def test_cluster_operator_health(admin_client):
 @pytest.mark.cluster_health_check
 def test_machine_config_pool_health(admin_client):
     failed_mcps = []
-    for mcp in MachineConfigPool.get(dyn_client=admin_client):
+    for mcp in MachineConfigPool.get(client=admin_client):
         mcp_instance = mcp.instance
         ready_count = mcp_instance.status.readyMachineCount
         machine_count = mcp_instance.status.machineCount

tests/chaos/conftest.py

@@ -150,7 +150,7 @@ def kmp_manager_nodes(admin_client):
     yield [
         pod.node
         for pod in get_pod_by_name_prefix(
-            dyn_client=admin_client,
+            client=admin_client,
             pod_prefix=KUBEMACPOOL_MAC_CONTROLLER_MANAGER,
             namespace=py_config["hco_namespace"],
             get_all=True,
@@ -189,7 +189,7 @@ def pod_deleting_process(request, admin_client):
     pod_prefix = request.param["pod_prefix"]
     namespace_name = request.param["namespace_name"]
     process = create_pod_deleting_process(
-        dyn_client=admin_client,
+        client=admin_client,
         pod_prefix=pod_prefix,
         namespace_name=namespace_name,
         ratio=request.param["ratio"],
@@ -390,7 +390,7 @@ def deleted_pod_by_name_prefix(admin_client, cnv_pod_deletion_test_matrix__class
     pod_deletion_config = cnv_pod_deletion_test_matrix__class__[pod_matrix_key]
 
     deleted_pod_by_name_prefix = create_pod_deleting_process(
-        dyn_client=admin_client,
+        client=admin_client,
         pod_prefix=pod_deletion_config["pod_prefix"],
         namespace_name=pod_deletion_config["namespace_name"],
         ratio=pod_deletion_config["ratio"],

tests/chaos/utils.py

@@ -52,7 +52,7 @@
 
 
 def create_pod_deleting_process(
-    dyn_client,
+    client,
     pod_prefix,
     namespace_name,
     ratio,
@@ -64,7 +64,7 @@ def create_pod_deleting_process(
     continuously deletes pods for a certain amount of time or until the process is stopped.
 
     Args:
-        dyn_client (DynamicClient)
+        client (DynamicClient)
         pod_prefix (str): Pod name prefix used to find the pods to be deleted.
         namespace_name (str): Name of the namespace were the pods to be deleted live.
         ratio (float): Percentage of pods to be deleted (expressed as a fraction between 0 and 1).
@@ -76,17 +76,17 @@ def create_pod_deleting_process(
 
     Example:
         pod_deleting_process = create_pod_deleting_process(
-            dyn_client=admin_client, pod_prefix="apiserver",
+            client=admin_client, pod_prefix="apiserver",
             namespace_name="openshift-apiserver", ratio=0.5, interval=5, max_duration=180
         )
         pod_deleting_process.start()
         ...
         pod_deleting_process.terminate()
     """
 
-    def _choose_surviving_pods(dyn_client, pod_prefix, namespace_name, ratio):
+    def _choose_surviving_pods(_client, pod_prefix, namespace_name, ratio):
         initial_pods = get_pod_by_name_prefix(
-            dyn_client=dyn_client,
+            client=_client,
             pod_prefix=pod_prefix,
             namespace=namespace_name,
             get_all=True,
@@ -100,9 +100,9 @@ def _choose_surviving_pods(dyn_client, pod_prefix, namespace_name, ratio):
 
         return surviving_pods
 
-    def _delete_pods(dyn_client, pod_prefix, namespace_name, surviving_pods):
+    def _delete_pods(_client, pod_prefix, namespace_name, surviving_pods):
         deleted_pods = get_pod_by_name_prefix(
-            dyn_client=dyn_client,
+            client=_client,
             pod_prefix=pod_prefix,
             namespace=namespace_name,
             get_all=True,
@@ -113,9 +113,9 @@ def _delete_pods(dyn_client, pod_prefix, namespace_name, surviving_pods):
                 with resource_log_level_error(resource=pod) as _pod:
                     _pod.delete()
 
-    def _delete_pods_continuously(dyn_client, pod_prefix, namespace_name, ratio, interval, max_duration):
+    def _delete_pods_continuously(_client, pod_prefix, namespace_name, ratio, interval, max_duration):
         surviving_pods = _choose_surviving_pods(
-            dyn_client=dyn_client,
+            _client=_client,
             pod_prefix=pod_prefix,
             namespace_name=namespace_name,
             ratio=ratio,
@@ -126,7 +126,7 @@ def _delete_pods_continuously(dyn_client, pod_prefix, namespace_name, ratio, int
                 wait_timeout=max_duration,
                 sleep=interval,
                 func=_delete_pods,
-                dyn_client=dyn_client,
+                _client=client,
                 pod_prefix=pod_prefix,
                 namespace_name=namespace_name,
                 surviving_pods=surviving_pods,
@@ -139,7 +139,7 @@ def _delete_pods_continuously(dyn_client, pod_prefix, namespace_name, ratio, int
         name="pod_delete",
         target=_delete_pods_continuously,
         args=(
-            dyn_client,
+            client,
             pod_prefix,
             namespace_name,
             ratio,
@@ -206,7 +206,7 @@ def _monitor_nginx_server(
 def get_pods_status(admin_client, namespaces):
     pods_status = {"pod_status": {}}
     for namespace in namespaces:
-        pods = get_pods(dyn_client=admin_client, namespace=namespace)
+        pods = get_pods(client=admin_client, namespace=namespace)
         pods_status["pod_status"][namespace.name] = {}
         for pod in pods:
             # Set the log level to ERROR to avoid cluttering the console

tests/conftest.py

@@ -421,7 +421,7 @@ def unprivileged_client(
 
 @pytest.fixture(scope="session")
 def nodes(admin_client):
-    yield list(Node.get(dyn_client=admin_client))
+    yield list(Node.get(client=admin_client))
 
 
 @pytest.fixture(scope="session")
@@ -1154,7 +1154,7 @@ def golden_images_namespace(
 ):
     for ns in Namespace.get(
         name=py_config["golden_images_namespace"],
-        dyn_client=admin_client,
+        client=admin_client,
     ):
         return ns
 
@@ -1165,7 +1165,7 @@ def golden_images_cluster_role_edit(
 ):
     for cluster_role in ClusterRole.get(
         name="os-images.kubevirt.io:edit",
-        dyn_client=admin_client,
+        client=admin_client,
     ):
         return cluster_role
 
@@ -1287,7 +1287,7 @@ def hyperconverged_ovs_annotations_fetched(hyperconverged_resource_scope_functio
 
 @pytest.fixture(scope="session")
 def network_addons_config_scope_session(admin_client):
-    nac = list(NetworkAddonsConfig.get(dyn_client=admin_client))
+    nac = list(NetworkAddonsConfig.get(client=admin_client))
     assert nac, "There should be one NetworkAddonsConfig CR."
     return nac[0]
 
@@ -1329,7 +1329,7 @@ def hyperconverged_ovs_annotations_enabled_scope_session(
     wait_for_ovs_status(network_addons_config=network_addons_config_scope_session, status=False)
     wait_for_pods_deletion(
         pods=get_pods(
-            dyn_client=admin_client,
+            client=admin_client,
             namespace=hco_namespace,
             label="app=ovs-cni",
         )
@@ -1338,7 +1338,7 @@ def hyperconverged_ovs_annotations_enabled_scope_session(
 
 @pytest.fixture(scope="session")
 def cluster_storage_classes(admin_client):
-    return list(StorageClass.get(dyn_client=admin_client))
+    return list(StorageClass.get(client=admin_client))
 
 
 @pytest.fixture(scope="session")
@@ -1391,7 +1391,7 @@ def hpp_cr_installed(hostpath_provisioner_scope_session):
 
 @pytest.fixture(scope="module")
 def cnv_pods(admin_client, hco_namespace):
-    yield list(Pod.get(dyn_client=admin_client, namespace=hco_namespace.name))
+    yield list(Pod.get(client=admin_client, namespace=hco_namespace.name))
 
 
 @pytest.fixture(scope="session")
@@ -1540,7 +1540,7 @@ def cluster_info(
 def ocs_current_version(ocs_storage_class, admin_client):
     if ocs_storage_class:
         for csv in ClusterServiceVersion.get(
-            dyn_client=admin_client,
+            client=admin_client,
             namespace="openshift-storage",
             label_selector=f"{ClusterServiceVersion.ApiGroup.OPERATORS_COREOS_COM}/ocs-operator.openshift-storage",
         ):
@@ -1549,7 +1549,7 @@ def ocs_current_version(ocs_storage_class, admin_client):
 
 @pytest.fixture(scope="session")
 def openshift_current_version(admin_client):
-    return get_clusterversion(dyn_client=admin_client).instance.status.history[0].version
+    return get_clusterversion(client=admin_client).instance.status.history[0].version
 
 
 @pytest.fixture(scope="session")
@@ -1567,7 +1567,7 @@ def hco_image(
         return CNV_NOT_INSTALLED
     source_name = cnv_subscription_scope_session.instance.spec.source
     for cs in CatalogSource.get(
-        dyn_client=admin_client,
+        client=admin_client,
         name=source_name,
         namespace=py_config["marketplace_namespace"],
     ):
@@ -1955,7 +1955,7 @@ def compact_cluster(nodes, workers, control_plane_nodes):
 
 @pytest.fixture()
 def virt_pods_with_running_status(admin_client, hco_namespace):
-    return get_all_virt_pods_with_running_status(dyn_client=admin_client, hco_namespace=hco_namespace)
+    return get_all_virt_pods_with_running_status(client=admin_client, hco_namespace=hco_namespace)
 
 
 @pytest.fixture(scope="session")

tests/infrastructure/golden_images/update_boot_source/conftest.py

@@ -94,7 +94,7 @@ def custom_data_import_cron_scope_function(
         sleep=5,
         func=lambda: list(
             DataImportCron.get(
-                dyn_client=admin_client,
+                client=admin_client,
                 name=expected_data_import_cron_name,
                 namespace=golden_images_namespace.name,
             )
@@ -111,7 +111,7 @@ def custom_data_source_scope_function(admin_client, custom_data_import_cron_scop
     try:
         return list(
             DataSource.get(
-                dyn_client=admin_client,
+                client=admin_client,
                 name=custom_data_source_name,
                 namespace=custom_data_import_cron_scope_function.namespace,
             )
@@ -217,7 +217,7 @@ def created_persistent_volume_claim(unprivileged_client, data_import_cron_namesp
     def _get_first_pvc():
         return next(
             PersistentVolumeClaim.get(
-                dyn_client=unprivileged_client,
+                client=unprivileged_client,
                 namespace=data_import_cron_namespace.name,
             ),
             None,

tests/infrastructure/golden_images/update_boot_source/test_ssp_data_sources.py

@@ -224,7 +224,7 @@ def update_data_source(data_source):
 
 @pytest.fixture()
 def golden_images_data_sources_scope_function(admin_client, golden_images_namespace):
-    return list(DataSource.get(dyn_client=admin_client, namespace=golden_images_namespace.name))
+    return list(DataSource.get(client=admin_client, namespace=golden_images_namespace.name))
 
 
 @pytest.fixture()

tests/infrastructure/sap/test_sap_hana_vm.py

@@ -327,7 +327,7 @@ def sriov_network_node_policy(admin_client, sriov_namespace):
     sriov_available_node_policies = [
         policy
         for policy in SriovNetworkNodePolicy.get(
-            dyn_client=admin_client,
+            client=admin_client,
             namespace=sriov_namespace.name,
         )
         if "sriov-network-policy" in policy.name

tests/infrastructure/workload_availability/remediation_fencing/test_nodehealthcheck_default_remediation.py

@@ -43,7 +43,7 @@ def created_nodehealthcheck_snr_object(admin_client, snr_remediation_template):
 
 @pytest.fixture(scope="module")
 def snr_remediation_template(admin_client, checkup_nodehealthcheck_operator_deployment):
-    template = next(SelfNodeRemediationTemplate.get(namespace=REMEDIATION_OPERATOR_NAMESPACE, dyn_client=admin_client))
+    template = next(SelfNodeRemediationTemplate.get(namespace=REMEDIATION_OPERATOR_NAMESPACE, client=admin_client))
     return {
         "apiVersion": template.api_version,
         "name": template.name,

tests/install_upgrade_operators/conftest.py

@@ -46,7 +46,7 @@ def cnv_deployment_by_name(admin_client, hco_namespace, hpp_cr_installed, cnv_de
             pytest.xfail(f"{deployment_name} deployment shouldn't be present on the cluster if HPP CR is not installed")
         hpp_pool_deployments = list(
             Deployment.get(
-                dyn_client=admin_client,
+                client=admin_client,
                 namespace=hco_namespace.name,
                 label_selector=f"{StorageClass.Provisioner.HOSTPATH_CSI}/storagePool=hpp-csi-pvc-block-hpp",
             )
@@ -89,7 +89,7 @@ def cnv_pods_by_type(
     if pod_prefix.startswith((HOSTPATH_PROVISIONER_CSI, HPP_POOL)) and not hpp_cr_installed:
         pytest.xfail(f"{pod_prefix} pods shouldn't be present on the cluster if HPP CR is not installed")
     pod_list = get_pod_by_name_prefix(
-        dyn_client=admin_client,
+        client=admin_client,
         namespace=hco_namespace.name,
         pod_prefix=pod_prefix,
         get_all=True,

tests/install_upgrade_operators/crds_cluster_readers_role/test_crds_cluster_readers_role.py

@@ -45,7 +45,7 @@ def get_cnv_crds(admin_client: DynamicClient) -> list[CustomResourceDefinition]:
     """
     return [
         crd
-        for crd in CustomResourceDefinition.get(dyn_client=admin_client)
+        for crd in CustomResourceDefinition.get(client=admin_client)
         if crd.name.endswith(Resource.ApiGroup.KUBEVIRT_IO)
     ]