WIP: Net regression wo localnet

libs/vm/factory.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
 from kubernetes.dynamic import DynamicClient
+from pytest_testconfig import config as py_config
 
 from libs.vm.spec import CPU, Devices, Domain, Memory, Metadata, Template, VMISpec, VMSpec
 from libs.vm.vm import BaseVirtualMachine, container_image, containerdisk_storage
-from utilities.constants import OS_FLAVOR_FEDORA, Images
+from utilities.constants import OS_FLAVOR_FEDORA
 
 
 def fedora_vm(
@@ -29,14 +30,18 @@ def fedora_vm(
 
 
 def fedora_image() -> str:
-    return container_image(base_image=Images.Fedora.FEDORA_CONTAINER_IMAGE)
+    from utilities.constants import ArchImages
+
+    arch_images = getattr(ArchImages, py_config["cpu_arch"].upper())
+    return container_image(base_image=arch_images.Fedora.FEDORA_CONTAINER_IMAGE)
 
 
 def _fill_vm_spec_defaults(spec: VMSpec | None) -> VMSpec:
     spec = spec or base_vmspec()
 
     vmi_spec = spec.template.spec
 
+    vmi_spec.architecture = vmi_spec.architecture or py_config["cpu_arch"]
     vmi_spec.domain.devices = vmi_spec.domain.devices or Devices(rng={})
     vmi_spec.domain.devices.disks = vmi_spec.domain.devices.disks or []
     vmi_spec.volumes = vmi_spec.volumes or []

libs/vm/spec.py

@@ -27,6 +27,7 @@ class Metadata:
 @dataclass
 class VMISpec:
     domain: Domain
+    architecture: str | None = None
     networks: list[Network] | None = None
     volumes: list[Volume] | None = None
     terminationGracePeriodSeconds: int | None = None  # noqa: N815

pytest.ini

@@ -72,6 +72,7 @@ markers =
     rwx_default_storage: Tests that require RWX storage
     descheduler: Tests that require kube-descheduler on nodes
     remote_cluster: Tests that require a remote cluster
+    localnet: Tests that use node localnet topology
 
     ## Required operators
     mtv: Tests that require the MTV operator to be installed

tests/network/localnet/ipam/test_connectivity.py

@@ -4,6 +4,8 @@
 from libs.vm.vm import BaseVirtualMachine
 from tests.network.localnet.liblocalnet import LOCALNET_IPAM_INTERFACE
 
+pytestmark = pytest.mark.localnet
+
 
 @pytest.mark.ipv4
 @pytest.mark.polarion("CNV-14043")

tests/network/localnet/migration_stuntime/test_migration_stuntime.py

@@ -20,6 +20,8 @@
 
 import pytest
 
+pytestmark = pytest.mark.localnet
+
 __test__ = False
 
 """

tests/network/localnet/test_default_bridge.py

@@ -14,6 +14,8 @@
 from utilities.constants import QUARANTINED
 from utilities.virt import migrate_vm_and_verify
 
+pytestmark = pytest.mark.localnet
+
 
 @pytest.mark.gating
 @pytest.mark.single_nic

tests/network/localnet/test_jumbo_frames.py

@@ -7,6 +7,7 @@
 from utilities.virt import vm_console_run_commands
 
 pytestmark = [
+    pytest.mark.localnet,
     pytest.mark.special_infra,
     pytest.mark.jumbo_frame,
 ]

tests/network/localnet/test_ovs_bridge.py

@@ -13,6 +13,8 @@
 )
 from utilities.virt import migrate_vm_and_verify
 
+pytestmark = pytest.mark.localnet
+
 
 @pytest.mark.s390x
 @pytest.mark.usefixtures("nncp_localnet_on_secondary_node_nic")