Mark network tests that don't require node's additional interfaces

Acceptance tests for new architectures, platforms etc. shouldn't depend on having extra
NICs on the cluster nodes, except for the primary interface. In order to have satisfactory
coveage in these tests, we mark all the these tests with the a new marker, which can and
should be used for these types of tests.

Author: yossisegev

pytest.ini

@@ -36,6 +36,7 @@ markers =
     hugepages: tests that require nodes with hugepages
     service_mesh: tests that require the service mesh operator to be installed
     jumbo_frame: tests that require network configurations supporting jumbo frames
+    single_nic: tests that dont require mutli-nic nodes, required for conformance tests for new archs, platforms etc.
     # CI
     smoke: Mark tests as smoke tests
     ci: Mark tests as CI tests

tests/network/cluster_addons_operator/test_network_addons_operator.py

@@ -215,6 +215,7 @@ def net_add_op_bridge_attached_vm(namespace, net_add_op_br1test_nad):
 
 @pytest.mark.gating
 @pytest.mark.post_upgrade
+@pytest.mark.single_nic
 @pytest.mark.polarion("CNV-2520")
 def test_component_installed_by_operator(network_addons_config_scope_session):
     """
@@ -246,6 +247,7 @@ def test_linux_bridge_functionality(net_add_op_bridge_attached_vm):
 
 
 @pytest.mark.polarion("CNV-6754")
+@pytest.mark.single_nic
 def test_cnao_labels(
     admin_client,
     network_addons_config_scope_session,

tests/network/connectivity/test_ovs_linux_bridge.py

@@ -50,6 +50,7 @@ def test_ipv4_linux_bridge(
     @pytest.mark.post_upgrade
     @pytest.mark.polarion("CNV-11125")
     @pytest.mark.ipv6
+    @pytest.mark.single_nic
     @pytest.mark.jira("CNV-58529", run=True)
     def test_ipv6_linux_bridge(
         self,

tests/network/connectivity/test_pod_network.py

@@ -102,6 +102,7 @@ def cloud_init_ipv6_network_data(dual_stack_network_data):
     indirect=False,
 )
 @pytest.mark.gating
+@pytest.mark.single_nic
 def test_connectivity_over_pod_network(
     ip_family,
     pod_net_vma,

tests/network/general/test_dhcp6_configurations_on_ipv4_single_stack_cluster.py

@@ -73,6 +73,7 @@ def listening_dhcpv6_pid_in_virt_launcher_pod(worker_node1_pod_executor, virt_la
 
 @pytest.mark.polarion("CNV-7407")
 @pytest.mark.ipv4
+@pytest.mark.single_nic
 def test_dhcp6_disabled_on_ipv4_single_stack_cluster(
     fail_if_not_ipv4_single_stack_cluster,
     vm_cirros,

tests/network/general/test_ip_family_services.py

@@ -105,6 +105,7 @@ def expected_num_families_in_service(request, dual_stack_cluster):
 
 class TestServiceConfigurationViaManifest:
     @pytest.mark.polarion("CNV-5789")
+    @pytest.mark.single_nic
     def test_service_with_configured_ip_families(
         self,
         running_vm_for_exposure,
@@ -116,6 +117,7 @@ def test_service_with_configured_ip_families(
         ), "Wrong ipFamilies set in service"
 
     @pytest.mark.polarion("CNV-5831")
+    @pytest.mark.single_nic
     def test_service_with_default_ip_family_policy(
         self,
         running_vm_for_exposure,
@@ -151,6 +153,7 @@ class TestServiceConfigurationViaVirtctl:
         ],
         indirect=["virtctl_expose_service", "expected_num_families_in_service"],
     )
+    @pytest.mark.single_nic
     def test_vitrctl_expose_services(
         self,
         expected_num_families_in_service,

tests/network/general/test_network_naming.py

@@ -12,6 +12,7 @@ def invalid_network_names():
 
 
 @pytest.mark.polarion("CNV-8304")
+@pytest.mark.single_nic
 def test_vm_with_illegal_network_name(namespace, unprivileged_client, invalid_network_names):
     vm_name = "unsupported-network-name-vm"
 

tests/network/general/test_vm_ips_report.py

@@ -38,12 +38,14 @@ def report_masquerade_ip_vmi(unprivileged_client, namespace):
 
 @pytest.mark.sno
 @pytest.mark.polarion("CNV-4455")
+@pytest.mark.single_nic
 def test_report_masquerade_ip(report_masquerade_ip_vmi):
     assert_ip_mismatch(vm=report_masquerade_ip_vmi)
 
 
 @pytest.mark.gating
 @pytest.mark.polarion("CNV-4153")
+@pytest.mark.single_nic
 def test_report_masquerade_ip_after_migration(report_masquerade_ip_vmi):
     src_node = report_masquerade_ip_vmi.instance.status.nodeName
     with VirtualMachineInstanceMigration(

tests/network/jumbo_frame/test_pod_network_ovn.py

@@ -17,6 +17,7 @@
 class TestJumboPodNetworkOnly:
     @pytest.mark.ipv4
     @pytest.mark.polarion("CNV-9660")
+    @pytest.mark.single_nic
     def test_jumbo_traffic_over_pod_network_separate_nodes(
         self,
         running_vma_jumbo_primary_interface_worker_1,
@@ -31,6 +32,7 @@ def test_jumbo_traffic_over_pod_network_separate_nodes(
 
     @pytest.mark.ipv4
     @pytest.mark.polarion("CNV-9671")
+    @pytest.mark.single_nic
     def test_jumbo_traffic_over_pod_network_same_node(
         self,
         running_vma_jumbo_primary_interface_worker_1,
@@ -45,6 +47,7 @@ def test_jumbo_traffic_over_pod_network_same_node(
 
     @pytest.mark.ipv4
     @pytest.mark.polarion("CNV-9672")
+    @pytest.mark.single_nic
     def test_jumbo_negative_traffic_over_pod_network_with_oversized_traffic(
         self,
         running_vma_jumbo_primary_interface_worker_1,

tests/network/kubemacpool/test_kubemacpool.py

@@ -120,6 +120,7 @@ def test_disabled_assignment_ns(
 
 @pytest.mark.sno
 @pytest.mark.polarion("CNV-4405")
+@pytest.mark.single_nic
 def test_kmp_down(namespace, kmp_down):
     with pytest.raises(ApiException):
         with VirtualMachineForTests(name="kmp-down-vm", namespace=namespace.name):