@@ -27,7 +27,7 @@
from framework.testbed_model.port import Port
from framework.testbed_model.sut_node import SutNode
from framework.testbed_model.tg_node import TGNode
-from framework.testbed_model.topology import Topology, TopologyType
+from framework.testbed_model.topology import Topology
from framework.testbed_model.traffic_generator.capturing_traffic_generator import (
PacketFilteringConfig,
)
@@ -73,7 +73,6 @@ class TestSuite(TestProtocol):
#: will block the execution of all subsequent test suites in the current build target.
is_blocking: ClassVar[bool] = False
_logger: DTSLogger
- _topology_type: TopologyType
_sut_port_ingress: Port
_sut_port_egress: Port
_sut_ip_address_ingress: Union[IPv4Interface, IPv6Interface]
@@ -102,7 +101,6 @@ def __init__(
self.sut_node = sut_node
self.tg_node = tg_node
self._logger = get_dts_logger(self.__class__.__name__)
- self._topology_type = topology.type
self._tg_port_egress = topology.tg_port_egress
self._sut_port_ingress = topology.sut_port_ingress
self._sut_port_egress = topology.sut_port_egress
@@ -468,6 +466,8 @@ def _decorator(func: TestSuiteMethodType) -> type[TestCase]:
test_case.skip = cls.skip
test_case.skip_reason = cls.skip_reason
test_case.required_capabilities = set()
+ test_case.topology_type = cls.topology_type
+ test_case.topology_type.add_to_required(test_case)
test_case.test_type = test_case_type
return test_case
@@ -7,11 +7,29 @@
and support for test environment capabilities.
Many test cases are testing features not available on all hardware.
+On the other hand, some test cases or suites may not need the most complex topology available.
-The module also allows developers to mark test cases or suites a requiring certain
-hardware capabilities with the :func:`requires` decorator.
+The module allows developers to mark test cases or suites a requiring certain hardware capabilities
+or a particular topology with the :func:`requires` decorator.
+
+There are differences between hardware and topology capabilities:
+
+ * Hardware capabilities are assumed to not be required when not specified.
+ * However, some topology is always available, so each test case or suite is assigned
+ a default topology if no topology is specified in the decorator.
+
+Examples:
+ .. code:: python
+
+ from framework.test_suite import TestSuite, func_test
+ from framework.testbed_model.capability import TopologyType, requires
+ # The whole test suite (each test case within) doesn't require any links.
+ @requires(topology_type=TopologyType.no_link)
+ @func_test
+ class TestHelloWorld(TestSuite):
+ def hello_world_single_core(self):
+ ...
-Example:
.. code:: python
from framework.test_suite import TestSuite, func_test
@@ -24,6 +42,7 @@ class TestPmdBufferScatter(TestSuite):
def test_scatter_mbuf_2048(self):
"""
+import inspect
from abc import ABC, abstractmethod
from collections.abc import MutableSet, Sequence
from dataclasses import dataclass
@@ -31,6 +50,7 @@ def test_scatter_mbuf_2048(self):
from typing_extensions import Self
+from framework.exception import ConfigurationError
from framework.logger import get_dts_logger
from framework.remote_session.testpmd_shell import (
NicCapability,
@@ -40,7 +60,7 @@ def test_scatter_mbuf_2048(self):
)
from .sut_node import SutNode
-from .topology import Topology
+from .topology import Topology, TopologyType
class Capability(ABC):
@@ -244,6 +264,154 @@ def __repr__(self) -> str:
return f"{condition_fn_name}{self.nic_capability}"
+@dataclass
+class TopologyCapability(Capability):
+ """A wrapper around :class:`~.topology.TopologyType`.
+
+ Each test case must be assigned a topology. It could be done explicitly;
+ the implicit default is :attr:`~.topology.TopologyType.default`, which this class defines
+ as equal to :attr:`~.topology.TopologyType.two_links`.
+
+ Test case topology may be set by setting the topology for the whole suite.
+ The priority in which topology is set is as follows:
+
+ #. The topology set using the :func:`requires` decorator with a test case,
+ #. The topology set using the :func:`requires` decorator with a test suite,
+ #. The default topology if the decorator is not used.
+
+ The default topology of test suite (i.e. when not using the decorator
+ or not setting the topology with the decorator) does not affect the topology of test cases.
+
+ New instances should be created with the :meth:`create_unique` class method to ensure
+ there are no duplicate instances.
+
+ Attributes:
+ topology_type: The topology type that defines each instance.
+ """
+
+ topology_type: TopologyType
+
+ _unique_capabilities: ClassVar[dict[str, Self]] = {}
+
+ def _preprocess_required(self, test_case_or_suite: type["TestProtocol"]) -> None:
+ test_case_or_suite.required_capabilities.discard(test_case_or_suite.topology_type)
+ test_case_or_suite.topology_type = self
+
+ @classmethod
+ def get_unique(cls, topology_type: TopologyType) -> "TopologyCapability":
+ """Get the capability uniquely identified by `topology_type`.
+
+ Args:
+ topology_type: The topology type.
+
+ Returns:
+ The capability uniquely identified by `topology_type`.
+ """
+ if topology_type.name not in cls._unique_capabilities:
+ cls._unique_capabilities[topology_type.name] = cls(topology_type)
+ return cls._unique_capabilities[topology_type.name]
+
+ @classmethod
+ def get_supported_capabilities(
+ cls, sut_node: SutNode, topology: "Topology"
+ ) -> set["TopologyCapability"]:
+ """Overrides :meth:`~OSSession.get_supported_capabilities`."""
+ supported_capabilities = set()
+ topology_capability = cls.get_unique(topology.type)
+ for topology_type in TopologyType:
+ candidate_topology_type = cls.get_unique(topology_type)
+ if candidate_topology_type <= topology_capability:
+ supported_capabilities.add(candidate_topology_type)
+ return supported_capabilities
+
+ def set_required(self, test_case_or_suite: type["TestProtocol"]) -> None:
+ """The logic for setting the required topology of a test case or suite.
+
+ Decorators are applied on methods of a class first, then on the class.
+ This means we have to modify test case topologies when processing the test suite topologies.
+ At that point, the test case topologies have been set by the :func:`requires` decorator.
+ The test suite topology only affects the test case topologies
+ if not :attr:`~.topology.TopologyType.default`.
+ """
+ if inspect.isclass(test_case_or_suite):
+ if self.topology_type is not TopologyType.default:
+ self.add_to_required(test_case_or_suite)
+ func_test_cases, perf_test_cases = test_case_or_suite.get_test_cases()
+ for test_case in func_test_cases | perf_test_cases:
+ if test_case.topology_type.topology_type is TopologyType.default:
+ # test case topology has not been set, use the one set by the test suite
+ self.add_to_required(test_case)
+ elif test_case.topology_type > test_case_or_suite.topology_type:
+ raise ConfigurationError(
+ "The required topology type of a test case "
+ f"({test_case.__name__}|{test_case.topology_type}) "
+ "cannot be more complex than that of a suite "
+ f"({test_case_or_suite.__name__}|{test_case_or_suite.topology_type})."
+ )
+ else:
+ self.add_to_required(test_case_or_suite)
+
+ def __eq__(self, other) -> bool:
+ """Compare the :attr:`~TopologyCapability.topology_type`s.
+
+ Args:
+ other: The object to compare with.
+
+ Returns:
+ :data:`True` if the topology types are the same.
+ """
+ return self.topology_type == other.topology_type
+
+ def __lt__(self, other) -> bool:
+ """Compare the :attr:`~TopologyCapability.topology_type`s.
+
+ Args:
+ other: The object to compare with.
+
+ Returns:
+ :data:`True` if the instance's topology type is less complex than the compared object's.
+ """
+ return self.topology_type < other.topology_type
+
+ def __gt__(self, other) -> bool:
+ """Compare the :attr:`~TopologyCapability.topology_type`s.
+
+ Args:
+ other: The object to compare with.
+
+ Returns:
+ :data:`True` if the instance's topology type is more complex than the compared object's.
+ """
+ return other < self
+
+ def __le__(self, other) -> bool:
+ """Compare the :attr:`~TopologyCapability.topology_type`s.
+
+ Args:
+ other: The object to compare with.
+
+ Returns:
+ :data:`True` if the instance's topology type is less complex or equal than
+ the compared object's.
+ """
+ return not self > other
+
+ def __hash__(self):
+ """Each instance is identified by :attr:`topology_type`."""
+ return self.topology_type.__hash__()
+
+ def __str__(self):
+ """Easy to read string of class and name of :attr:`topology_type`."""
+ name = self.topology_type.name
+ if self.topology_type is TopologyType.default:
+ name = TopologyType.get_from_value(self.topology_type.value)
+ return f"{type(self.topology_type).__name__}.{name}"
+
+ def __repr__(self):
+ """Easy to read string of class and name of :attr:`topology_type`."""
+ return self.__str__()
+
+
class TestProtocol(Protocol):
"""Common test suite and test case attributes."""
@@ -251,6 +419,8 @@ class TestProtocol(Protocol):
skip: ClassVar[bool] = False
#: The reason for skipping the test case or suite.
skip_reason: ClassVar[str] = ""
+ #: The topology type of the test case or suite.
+ topology_type: ClassVar[TopologyCapability] = TopologyCapability(TopologyType.default)
#: The capabilities the test case or suite requires in order to be executed.
required_capabilities: ClassVar[set[Capability]] = set()
@@ -267,6 +437,7 @@ def get_test_cases(cls, test_case_sublist: Sequence[str] | None = None) -> tuple
def requires(
*nic_capabilities: NicCapability,
decorator_fn: TestPmdShellDecorator | None = None,
+ topology_type: TopologyType = TopologyType.default,
) -> Callable[[type[TestProtocol]], type[TestProtocol]]:
"""A decorator that adds the required capabilities to a test case or test suite.
@@ -287,6 +458,9 @@ def add_required_capability(test_case_or_suite: type[TestProtocol]) -> type[Test
)
decorated_nic_capability.add_to_required(test_case_or_suite)
+ topology_capability = TopologyCapability.get_unique(topology_type)
+ topology_capability.set_required(test_case_or_suite)
+
return test_case_or_suite
return add_required_capability
@@ -8,15 +8,20 @@
"""
from dataclasses import dataclass
-from enum import IntEnum
-from typing import Iterable
+from typing import TYPE_CHECKING, Iterable
+
+if TYPE_CHECKING:
+ from enum import Enum as NoAliasEnum
+else:
+ from aenum import NoAliasEnum
from framework.config import PortConfig
+from framework.exception import ConfigurationError
from .port import Port
-class TopologyType(IntEnum):
+class TopologyType(int, NoAliasEnum):
"""Supported topology types."""
#: A topology with no Traffic Generator.
@@ -25,6 +30,28 @@ class TopologyType(IntEnum):
one_link = 1
#: A topology with two physical links between the Sut node and the TG node.
two_links = 2
+ #: The default topology required by test cases if not specified otherwise.
+ default = 2
+
+ @classmethod
+ def get_from_value(cls, value: int) -> "TopologyType":
+ """Get the corresponding instance from value.
+
+ :class:`Enum`s that don't allow aliases don't know which instance should be returned
+ as there could be multiple valid instances. Except for the :attr:`default` value,
+ :class:`TopologyType` is a regular Enum. When creating an instance from value, we're
+ not interested in the default, since we already know the value, allowing us to remove
+ the ambiguity.
+ """
+ match value:
+ case 0:
+ return TopologyType.no_link
+ case 1:
+ return TopologyType.one_link
+ case 2:
+ return TopologyType.two_links
+ case _:
+ raise ConfigurationError("More than two links in a topology are not supported.")
class Topology:
@@ -72,7 +99,7 @@ def __init__(self, sut_ports: Iterable[Port], tg_ports: Iterable[Port]):
):
port_links.append(PortLink(sut_port=sut_port, tg_port=tg_port))
- self.type = TopologyType(len(port_links))
+ self.type = TopologyType.get_from_value(len(port_links))
dummy_port = Port(PortConfig("", "", "", "", "", ""))
self.tg_port_egress = dummy_port
self.sut_port_ingress = dummy_port
@@ -9,6 +9,7 @@
from framework.remote_session.dpdk_shell import compute_eal_params
from framework.test_suite import TestSuite, func_test
+from framework.testbed_model.capability import TopologyType, requires
from framework.testbed_model.cpu import (
LogicalCoreCount,
LogicalCoreCountFilter,
@@ -16,6 +17,7 @@
)
+@requires(topology_type=TopologyType.no_link)
class TestHelloWorld(TestSuite):
"""DPDK hello world app test suite."""
@@ -54,15 +54,9 @@ def set_up_suite(self) -> None:
"""Set up the test suite.
Setup:
- Verify that we have at least 2 port links in the current test run
- and increase the MTU of both ports on the traffic generator to 9000
+ Increase the MTU of both ports on the traffic generator to 9000
to support larger packet sizes.
"""
- self.verify(
- self._topology_type > 1,
- "There must be at least two port links to run the scatter test suite",
- )
-
self.tg_node.main_session.configure_port_mtu(9000, self._tg_port_egress)
self.tg_node.main_session.configure_port_mtu(9000, self._tg_port_ingress)
@@ -18,9 +18,11 @@
from framework.remote_session.testpmd_shell import TestPmdShell
from framework.settings import SETTINGS
from framework.test_suite import TestSuite, func_test
+from framework.testbed_model.capability import TopologyType, requires
from framework.utils import REGEX_FOR_PCI_ADDRESS
+@requires(topology_type=TopologyType.no_link)
class TestSmokeTests(TestSuite):
"""DPDK and infrastructure smoke test suite.