Merge branch 'main' into testCustomCliDownload

Author: OhadRevah

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
         stages: [pre-commit]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.11
+    rev: v0.13.0
     hooks:
       - id: ruff
         stages: [pre-commit]
@@ -65,7 +65,7 @@ repos:
       - id: gitleaks
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.17.1
+    rev: v1.18.1
     hooks:
       - id: mypy
         exclude: "test_(.*).py$"

libs/infra/images.py

@@ -19,6 +19,14 @@ class Cirros:
     DEFAULT_MEMORY_SIZE: str = "64M"
 
 
+@dataclass
+class Alpine:
+    QCOW2_IMG: str | None = None
+    DIR: str = f"{BASE_IMAGES_DIR}/alpine-images"
+    DEFAULT_DV_SIZE: str = "1Gi"
+    DEFAULT_MEMORY_SIZE: str = "128M"
+
+
 @dataclass
 class Rhel:
     RHEL7_9_IMG: str | None = None

libs/net/netattachdef.py

@@ -11,6 +11,39 @@
 _DEFAULT_CNI_VERSION: Final[str] = "0.3.1"
 
 
+@dataclass
+class Ipam:
+    """
+    IP Address Management (IPAM) base class
+    Ref: https://www.cni.dev/plugins/current/ipam/
+    """
+
+    type: str = field(init=False)
+
+
+@dataclass
+class IpamRoute:
+    dst: str
+    gw: str | None = None
+
+
+@dataclass
+class IpamStatic(Ipam):
+    """
+    IPAM static plugin
+    Ref: https://www.cni.dev/plugins/current/ipam/static/
+    """
+
+    type: str = field(default="static", init=False)
+    addresses: list["IpamStatic.Address"]
+    routes: list[IpamRoute] | None = None
+
+    @dataclass
+    class Address:
+        address: str
+        gateway: str | None = None
+
+
 @dataclass
 class CNIPluginConfig:
     type: str = field(init=False)
@@ -50,6 +83,19 @@ class Topology(Enum):
         LOCALNET = "localnet"
 
 
+@dataclass
+class CNIPluginMacvlanConfig(CNIPluginConfig):
+    """
+    CNI Macvlan Plugin
+    Ref: https://www.cni.dev/plugins/current/main/macvlan/
+    """
+
+    type: str = field(default="macvlan", init=False)
+    master: str
+    ipam: Ipam | None = None
+    mode: str = "bridge"
+
+
 @dataclass
 class NetConfig:
     """

libs/net/udn.py

@@ -1,9 +1,26 @@
+from collections.abc import Generator
 from typing import Final
 
+from kubernetes.dynamic import DynamicClient
+from ocp_resources.namespace import Namespace
+
 from libs.vm.spec import Interface, NetBinding, Network
+from utilities.infra import create_ns
 
 UDN_BINDING_PLUGIN_NAME: Final[str] = "l2bridge"
 
 
 def udn_primary_network(name: str) -> tuple[Interface, Network]:
     return Interface(name=name, binding=NetBinding(name=UDN_BINDING_PLUGIN_NAME)), Network(name=name, pod={})
+
+
+def create_udn_namespace(
+    name: str,
+    client: DynamicClient,
+    labels: dict[str, str] | None = None,
+) -> Generator[Namespace]:
+    return create_ns(
+        name=name,
+        labels={"k8s.ovn.org/primary-user-defined-network": "", **(labels or {})},
+        admin_client=client,
+    )

pyproject.toml

@@ -9,18 +9,19 @@ exclude = [".git", ".venv", ".mypy_cache", ".tox", "__pycache__"]
 
 [tool.ruff.lint.isort]
 order-by-type = true
-known-third-party = ["ocp_resources", "ocp_utilities", "timeout_sampler", "pyhelper_utils"]
+known-third-party = [
+  "ocp_resources",
+  "ocp_utilities",
+  "timeout_sampler",
+  "pyhelper_utils",
+]
 
 [tool.mypy]
 warn_unused_configs = true
 warn_redundant_casts = true
 
 [[tool.mypy.overrides]]
-module = [
-  "libs.*",
-  "tests.network.libs.*",
-  "tests.network.localnet.*"
-]
+module = ["libs.*", "tests.network.libs.*", "tests.network.localnet.*"]
 disallow_untyped_calls = true
 disallow_untyped_defs = true
 disallow_incomplete_defs = true
@@ -78,17 +79,18 @@ dependencies = [
   "marshmallow~=3.26.1",
   "python-simple-logger>=2.0.13",
   "pytest-html>=4.1.1",
+  "openshift-python-wrapper>=11.0.93",
 ]
 
 [project.optional-dependencies]
 # Dependencies for utilities unit testing
 utilities-test = [
-    "pytest>=8.3.3",
-    "pytest-cov>=4.1.0",
-    "pytest-mock>=3.12.0",
-    "pytest-xdist>=3.5.0",
-    "pytest-timeout>=2.2.0",
-    "pytest-watch>=4.2.0",
+  "pytest>=8.3.3",
+  "pytest-cov>=4.1.0",
+  "pytest-mock>=3.12.0",
+  "pytest-xdist>=3.5.0",
+  "pytest-timeout>=2.2.0",
+  "pytest-watch>=4.2.0",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -123,33 +125,33 @@ addopts = """
 [tool.coverage.run]
 source = ["utilities"]
 omit = [
-    "*/tests/*",
-    "*/__pycache__/*",
-    "*/manifests/*",
-    "*.pyc",
-    "*/test_*.py",
-    "__init__.py",
-    "utilities/unittests/conftest.py",
-    # TODO: Add coverage to these large modules when individual fixes are needed
-    "utilities/hco.py",
-    "utilities/infra.py",
-    "utilities/network.py",
-    "utilities/operator.py",
-    "utilities/storage.py",
-    "utilities/virt.py",
+  "*/tests/*",
+  "*/__pycache__/*",
+  "*/manifests/*",
+  "*.pyc",
+  "*/test_*.py",
+  "__init__.py",
+  "utilities/unittests/conftest.py",
+  # TODO: Add coverage to these large modules when individual fixes are needed
+  "utilities/hco.py",
+  "utilities/infra.py",
+  "utilities/network.py",
+  "utilities/operator.py",
+  "utilities/storage.py",
+  "utilities/virt.py",
 ]
 
 [tool.coverage.report]
 precision = 2
 exclude_lines = [
-    "pragma: no cover",
-    "def __repr__",
-    "if TYPE_CHECKING:",
-    "raise AssertionError",
-    "raise NotImplementedError",
-    "if __name__ == .__main__.:",
-    "pass",
-    "except ImportError:",
+  "pragma: no cover",
+  "def __repr__",
+  "if TYPE_CHECKING:",
+  "raise AssertionError",
+  "raise NotImplementedError",
+  "if __name__ == .__main__.:",
+  "pass",
+  "except ImportError:",
 ]
 show_missing = true
 skip_covered = false

pytest.ini

@@ -36,6 +36,7 @@ markers =
     gpu: Tests that require cluster with gpu cards
     sriov: Tests that require sriov net-cards on nodes
     single_nic: Tests that don`t require mutli-nic nodes, required for conformance tests for new archs, platforms etc.
+    bgp: Tests that require special VLAN configuration on node NICs
 
     ## Configuration requirements
     ipv4: Tests that require IPv4

tests/chaos/OWNERS

@@ -1,2 +1,3 @@
 reviewers:
   - qwang1
+  - sarahbx

tests/chaos/oadp/conftest.py

@@ -3,10 +3,17 @@
 
 import pytest
 
-from utilities.constants import BACKUP_STORAGE_LOCATION, FILE_NAME_FOR_BACKUP, TEXT_TO_TEST, TIMEOUT_3MIN, TIMEOUT_10MIN
+from utilities.constants import (
+    BACKUP_STORAGE_LOCATION,
+    FILE_NAME_FOR_BACKUP,
+    TEXT_TO_TEST,
+    TIMEOUT_3MIN,
+    TIMEOUT_10MIN,
+)
 from utilities.infra import ExecCommandOnPod, wait_for_node_status
 from utilities.oadp import VeleroBackup, create_rhel_vm
 from utilities.storage import write_file
+from utilities.virt import node_mgmt_console, wait_for_node_schedulable_status
 
 LOGGER = logging.getLogger(__name__)
 
@@ -64,3 +71,11 @@ def rebooted_vm_source_node(rhel_vm_with_dv_running, oadp_backup_in_progress, wo
     LOGGER.info(f"Waiting for node {vm_node.name} to come back online")
     wait_for_node_status(node=vm_node, status=True, wait_timeout=TIMEOUT_10MIN)
     return
+
+
+@pytest.fixture()
+def drain_vm_source_node(rhel_vm_with_dv_running, oadp_backup_in_progress):
+    vm_node = rhel_vm_with_dv_running.vmi.node
+    with node_mgmt_console(node=vm_node, node_mgmt="drain"):
+        wait_for_node_schedulable_status(node=vm_node, status=False)
+        yield vm_node

tests/chaos/oadp/test_oadp.py

@@ -39,3 +39,32 @@ def test_reboot_vm_node_during_backup(
     oadp_backup_in_progress.wait_for_status(
         status=oadp_backup_in_progress.Backup.Status.PARTIALLYFAILED, timeout=TIMEOUT_10MIN
     )
+
+
+@pytest.mark.destructive
+@pytest.mark.chaos
+@pytest.mark.parametrize(
+    "rhel_vm_with_dv_running",
+    [
+        pytest.param(
+            {
+                "vm_name": "vm-node-drain-12020",
+                "rhel_image": RHEL_LATEST["image_name"],
+            },
+            marks=pytest.mark.polarion("CNV-12020"),
+        ),
+    ],
+    indirect=True,
+)
+def test_drain_vm_node_during_backup(
+    oadp_backup_in_progress,
+    drain_vm_source_node,
+):
+    """
+    Drain the worker node where the VM is located during OADP backup using DataMover.
+    Validate that backup eventually Completed.
+    """
+    LOGGER.info(f"Waiting for backup to reach '{oadp_backup_in_progress.Backup.Status.COMPLETED}' during node drain.")
+    oadp_backup_in_progress.wait_for_status(
+        status=oadp_backup_in_progress.Backup.Status.COMPLETED, timeout=TIMEOUT_10MIN
+    )