infra/tests, net, nncp: require explicit client for NNCP

tests/conftest.py

@@ -961,14 +961,19 @@ def started_windows_vm(
 
 
 @pytest.fixture(scope="session")
-def worker_nodes_ipv4_false_secondary_nics(nodes_available_nics, schedulable_nodes):
+def worker_nodes_ipv4_false_secondary_nics(
+    admin_client,
+    nodes_available_nics,
+    schedulable_nodes,
+):
     """
     Function removes ipv4 from secondary nics.
     """
     for worker_node in schedulable_nodes:
         worker_nics = nodes_available_nics[worker_node.name]
         with EthernetNetworkConfigurationPolicy(
             name=f"disable-ipv4-{name_prefix(worker_node.name)}",
+            client=admin_client,
             node_selector=get_node_selector_dict(node_selector=worker_node.hostname),
             interfaces_name=worker_nics,
         ):
@@ -1066,13 +1071,20 @@ def sriov_ifaces(sriov_nodes_states, workers_utility_pods):
 
 
 @pytest.fixture(scope="session")
-def sriov_node_policy(sriov_unused_ifaces, sriov_nodes_states, workers_utility_pods, sriov_namespace):
+def sriov_node_policy(
+    admin_client,
+    sriov_unused_ifaces,
+    sriov_nodes_states,
+    workers_utility_pods,
+    sriov_namespace,
+):
     yield from create_sriov_node_policy(
         nncp_name="test-sriov-policy",
         namespace=sriov_namespace.name,
         sriov_iface=sriov_unused_ifaces[0],
         sriov_nodes_states=sriov_nodes_states,
         sriov_resource_name="sriov_net",
+        client=admin_client,
     )
 
 
@@ -1671,6 +1683,7 @@ def term_handler_scope_session():
 
 @pytest.fixture(scope="session")
 def upgrade_bridge_on_all_nodes(
+    admin_client,
     label_schedulable_nodes,
     hosts_common_available_ports,
 ):
@@ -1680,17 +1693,19 @@ def upgrade_bridge_on_all_nodes(
         interface_name="br1upgrade",
         node_selector_labels=NODE_TYPE_WORKER_LABEL,
         ports=[hosts_common_available_ports[0]],
+        client=admin_client,
     ) as br:
         yield br
 
 
 @pytest.fixture(scope="session")
-def bridge_on_one_node(worker_node1):
+def bridge_on_one_node(admin_client, worker_node1):
     with network_device(
         interface_type=LINUX_BRIDGE,
         nncp_name="upgrade-br-marker",
         interface_name="upg-br-mark",
         node_selector=get_node_selector_dict(node_selector=worker_node1.name),
+        client=admin_client,
     ) as br:
         yield br
 

tests/install_upgrade_operators/must_gather/conftest.py

@@ -162,12 +162,13 @@ def must_gather_nad(admin_client, must_gather_bridge, node_gather_unprivileged_n
 
 
 @pytest.fixture(scope="package")
-def must_gather_bridge(worker_node1):
+def must_gather_bridge(admin_client, worker_node1):
     with network_device(
         interface_type=LINUX_BRIDGE,
         nncp_name="must-gather-br",
         interface_name="mg-br1",
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
+        client=admin_client,
     ) as br:
         yield br
 

tests/network/bgp/conftest.py

@@ -45,8 +45,13 @@
 
 
 @pytest.fixture(scope="session")
-def vlan_nncp(vlan_base_iface: str, worker_node1: Node) -> Generator[libnncp.NodeNetworkConfigurationPolicy]:
+def vlan_nncp(
+    admin_client: DynamicClient,
+    vlan_base_iface: str,
+    worker_node1: Node,
+) -> Generator[libnncp.NodeNetworkConfigurationPolicy]:
     with libnncp.NodeNetworkConfigurationPolicy(
+        client=admin_client,
         name="test-vlan-nncp",
         desired_state=libnncp.DesiredState(
             interfaces=[

tests/network/bond/test_bond_modes.py

@@ -63,6 +63,7 @@ def create_vm(namespace, nad, node_selector, unprivileged_client):
 
 @pytest.fixture()
 def matrix_bond_modes_bond(
+    admin_client,
     index_number,
     link_aggregation_mode_no_connectivity_matrix__function__,
     nodes_available_nics,
@@ -75,6 +76,7 @@ def matrix_bond_modes_bond(
     with BondNodeNetworkConfigurationPolicy(
         name=f"matrix-bond{bond_index}-nncp",
         bond_name=f"mtx-bond{bond_index}",
+        client=admin_client,
         bond_ports=nodes_available_nics[worker_node1.name][-2:],
         mode=link_aggregation_mode_no_connectivity_matrix__function__,
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
@@ -96,6 +98,7 @@ def bond_modes_nad(admin_client, bridge_device_matrix__function__, namespace, ma
 
 @pytest.fixture()
 def matrix_bond_modes_bridge(
+    admin_client,
     bridge_device_matrix__function__,
     worker_node1,
     bond_modes_nad,
@@ -110,6 +113,7 @@ def matrix_bond_modes_bridge(
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
         interface_name=bond_modes_nad.bridge_name,
         ports=[matrix_bond_modes_bond.bond_name],
+        client=admin_client,
     ) as br:
         yield br
 
@@ -133,6 +137,7 @@ def bond_modes_vm(
 
 @pytest.fixture()
 def bridge_on_bond_fail_over_mac(
+    admin_client,
     bridge_device_matrix__function__,
     worker_node1,
     bond_modes_nad,
@@ -147,14 +152,16 @@ def bridge_on_bond_fail_over_mac(
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
         interface_name=bond_modes_nad.bridge_name,
         ports=[active_backup_bond_with_fail_over_mac.bond_name],
+        client=admin_client,
     ) as br:
         yield br
 
 
 @pytest.fixture()
-def active_backup_bond_with_fail_over_mac(index_number, worker_node1, nodes_available_nics):
+def active_backup_bond_with_fail_over_mac(admin_client, index_number, worker_node1, nodes_available_nics):
     bond_index = next(index_number)
     with BondNodeNetworkConfigurationPolicy(
+        client=admin_client,
         name=f"active-bond{bond_index}-nncp",
         bond_name=f"act-bond{bond_index}",
         bond_ports=nodes_available_nics[worker_node1.name][-2:],
@@ -184,9 +191,10 @@ def vm_with_fail_over_mac_bond(
 
 
 @pytest.fixture()
-def bond_resource(index_number, nodes_available_nics, worker_node1):
+def bond_resource(admin_client, index_number, nodes_available_nics, worker_node1):
     bond_idx = next(index_number)
     with BondNodeNetworkConfigurationPolicy(
+        client=admin_client,
         name=f"bond-with-port{bond_idx}nncp",
         bond_name=f"bond-w-port{bond_idx}",
         bond_ports=nodes_available_nics[worker_node1.name][-2:],
@@ -211,6 +219,7 @@ def test_vm_started(bond_modes_vm):
 @pytest.mark.polarion("CNV-6583")
 @pytest.mark.s390x
 def test_active_backup_bond_with_fail_over_mac(
+    admin_client,
     index_number,
     worker_node1,
     nodes_available_nics,
@@ -220,6 +229,7 @@ def test_active_backup_bond_with_fail_over_mac(
     with BondNodeNetworkConfigurationPolicy(
         name=f"test-active-bond{bond_index}-nncp",
         bond_name=f"test-act-bond{bond_index}",
+        client=admin_client,
         bond_ports=nodes_available_nics[worker_node1.name][-2:],
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
         options={"fail_over_mac": "active"},

tests/network/bond/test_l2_bridge_over_bond.py

@@ -39,6 +39,7 @@ def ovs_linux_br1bond_nad(admin_client, bridge_device_matrix__class__, namespace
 
 @pytest.fixture(scope="class")
 def ovs_linux_bond1_worker_1(
+    admin_client,
     index_number,
     worker_node1,
     nodes_available_nics,
@@ -48,6 +49,7 @@ def ovs_linux_bond1_worker_1(
     """
     bond_idx = next(index_number)
     with BondNodeNetworkConfigurationPolicy(
+        client=admin_client,
         name=f"bond{bond_idx}nncp-worker-1",
         bond_name=f"bond{bond_idx}",
         bond_ports=nodes_available_nics[worker_node1.name][-2:],
@@ -58,6 +60,7 @@ def ovs_linux_bond1_worker_1(
 
 @pytest.fixture(scope="class")
 def ovs_linux_bond1_worker_2(
+    admin_client,
     index_number,
     worker_node2,
     nodes_available_nics,
@@ -70,6 +73,7 @@ def ovs_linux_bond1_worker_2(
     with (
         BondNodeNetworkConfigurationPolicy(
             name=f"bond{bond_idx}nncp-worker-2",
+            client=admin_client,
             bond_name=ovs_linux_bond1_worker_1.bond_name,  # Use the same BOND name for each test.
             bond_ports=nodes_available_nics[worker_node2.name][-2:],
             node_selector=get_node_selector_dict(node_selector=worker_node2.hostname),
@@ -80,6 +84,7 @@ def ovs_linux_bond1_worker_2(
 
 @pytest.fixture(scope="class")
 def ovs_linux_bridge_on_bond_worker_1(
+    admin_client,
     bridge_device_matrix__class__,
     worker_node1,
     ovs_linux_br1bond_nad,
@@ -94,12 +99,14 @@ def ovs_linux_bridge_on_bond_worker_1(
         interface_name=ovs_linux_br1bond_nad.bridge_name,
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
         ports=[ovs_linux_bond1_worker_1.bond_name],
+        client=admin_client,
     ) as br:
         yield br
 
 
 @pytest.fixture(scope="class")
 def ovs_linux_bridge_on_bond_worker_2(
+    admin_client,
     bridge_device_matrix__class__,
     worker_node2,
     ovs_linux_br1bond_nad,
@@ -114,6 +121,7 @@ def ovs_linux_bridge_on_bond_worker_2(
         interface_name=ovs_linux_br1bond_nad.bridge_name,
         node_selector=get_node_selector_dict(node_selector=worker_node2.hostname),
         ports=[ovs_linux_bond1_worker_2.bond_name],
+        client=admin_client,
     ) as br:
         yield br
 

tests/network/connectivity/conftest.py

@@ -35,6 +35,7 @@ def fail_if_not_ipv6_supported_cluster(ipv6_supported_cluster):
 
 @pytest.fixture(scope="class")
 def nncp_linux_bridge_device_worker_1_source(
+    admin_client,
     nodes_available_nics,
     worker_node1,
     bridge_device_name,
@@ -45,12 +46,14 @@ def nncp_linux_bridge_device_worker_1_source(
         interface_name=bridge_device_name,
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
         ports=[nodes_available_nics[worker_node1.name][-1]],
+        client=admin_client,
     ) as br:
         yield br
 
 
 @pytest.fixture(scope="class")
 def nncp_ovs_bridge_device_worker_1_source(
+    admin_client,
     nodes_available_nics,
     worker_node1,
     bridge_device_name,
@@ -61,12 +64,14 @@ def nncp_ovs_bridge_device_worker_1_source(
         interface_name=bridge_device_name,
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
         ports=[nodes_available_nics[worker_node1.name][-1]],
+        client=admin_client,
     ) as br:
         yield br
 
 
 @pytest.fixture(scope="class")
 def nncp_linux_bridge_device_worker_2_destination(
+    admin_client,
     nodes_available_nics,
     worker_node2,
     bridge_device_name,
@@ -77,12 +82,14 @@ def nncp_linux_bridge_device_worker_2_destination(
         interface_name=bridge_device_name,
         node_selector=get_node_selector_dict(node_selector=worker_node2.hostname),
         ports=[nodes_available_nics[worker_node2.name][-1]],
+        client=admin_client,
     ) as br:
         yield br
 
 
 @pytest.fixture(scope="class")
 def nncp_ovs_bridge_device_worker_2_destination(
+    admin_client,
     nodes_available_nics,
     worker_node2,
     bridge_device_name,
@@ -93,6 +100,7 @@ def nncp_ovs_bridge_device_worker_2_destination(
         interface_name=bridge_device_name,
         node_selector=get_node_selector_dict(node_selector=worker_node2.hostname),
         ports=[nodes_available_nics[worker_node2.name][-1]],
+        client=admin_client,
     ) as br:
         yield br
 

tests/network/dry_run/test_dry_run_kubemacpool.py

@@ -32,12 +32,13 @@ def create_dry_run_vm(name, namespace, networks, unprivileged_client, macs=None)
 
 
 @pytest.fixture()
-def bridge_on_all_nodes():
+def bridge_on_all_nodes(admin_client):
     bridge_name = "br-dry-run-test"
     with network_device(
         interface_type=LINUX_BRIDGE,
         nncp_name=f"{bridge_name}-nncp",
         interface_name=bridge_name,
+        client=admin_client,
     ) as dev:
         yield dev
 

tests/network/general/test_bridge_marker.py

@@ -104,28 +104,31 @@ def multi_bridge_attached_vmi(namespace, bridge_networks, unprivileged_client):
 
 
 @pytest.fixture()
-def bridge_device_on_all_nodes():
+def bridge_device_on_all_nodes(admin_client):
     with network_device(
         interface_type=LINUX_BRIDGE,
         nncp_name="bridge-marker1",
         interface_name=BRIDGEMARKER1,
+        client=admin_client,
     ) as dev:
         yield dev
 
 
 @pytest.fixture()
-def non_homogenous_bridges(worker_node1, worker_node2):
+def non_homogenous_bridges(admin_client, worker_node1, worker_node2):
     with network_device(
         interface_type=LINUX_BRIDGE,
         nncp_name="bridge-marker2",
         interface_name=BRIDGEMARKER2,
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
+        client=admin_client,
     ) as bridgemarker2_ncp:
         with network_device(
             interface_type=LINUX_BRIDGE,
             nncp_name="bridge-marker3",
             interface_name=BRIDGEMARKER3,
             node_selector=get_node_selector_dict(node_selector=worker_node2.hostname),
+            client=admin_client,
         ) as bridgemarker3_ncp:
             yield bridgemarker2_ncp, bridgemarker3_ncp
 

tests/network/general/test_cnv_tuning_regression.py

@@ -21,12 +21,13 @@ def linux_bridge_nad(admin_client, namespace):
 
 
 @pytest.fixture()
-def linux_bridge_device(worker_node1, linux_bridge_nad):
+def linux_bridge_device(admin_client, worker_node1, linux_bridge_nad):
     with network_device(
         interface_type=LINUX_BRIDGE,
         nncp_name="cnv-tuning-nncp",
         interface_name=linux_bridge_nad.bridge_name,
         node_selector=get_node_selector_dict(node_selector=worker_node1.hostname),
+        client=admin_client,
     ) as dev:
         yield dev
 

tests/network/jumbo_frame/conftest.py

@@ -121,13 +121,14 @@ def secondary_linux_bridge_nad(admin_client, namespace, linux_bridge_interface):
 
 
 @pytest.fixture(scope="module")
-def linux_bridge_interface(hosts_common_available_ports):
+def linux_bridge_interface(admin_client, hosts_common_available_ports):
     with network_device(
         interface_type=LINUX_BRIDGE,
         nncp_name="sec-br",
         interface_name="sec-br",
         ports=[hosts_common_available_ports[-1]],
         node_selector_labels={WORKER_NODE_LABEL_KEY: ""},
+        client=admin_client,
     ) as br:
         yield br