From: Jeremy Spewock <jspew...@iol.unh.edu>
This patch ports over the functionality of the dual_vlan suite from old
DTS to the new framework. This test suite exists to test the
functionality of VLAN functions such as stripping, inserting, and
filerting in the presence of two VLAN headers.
There are some test cases which were left out in this refactored version
including test cases that test the functionality of VLAN functions on a
packet with only one VLAN header, as this is something that is tested in
another test suite which is currently in development. Additionally,
this series does not include test cases for testing the adjustment of
TPID or extended VLAN ranges, as these things were included in the old
test suite specifically for testing on Intel hardware and they are not
universally supported on every NIC. There could be further reason to add
these test cases in the future once the capabilities feature is fully
implemented. Extended mode for VLANs seems to be exposed through offload
capabilities of the port, but there doesn't seem to be anything as
obvious for TPID modification.
depends-on: patch-142103 ("dts: add VLAN methods to testpmd shell")
Signed-off-by: Jeremy Spewock <jspew...@iol.unh.edu>
---
dts/tests/TestSuite_dual_vlan.py | 281 +++++++++++++++++++++++++++++++
1 file changed, 281 insertions(+)
create mode 100644 dts/tests/TestSuite_dual_vlan.py
diff --git a/dts/tests/TestSuite_dual_vlan.py b/dts/tests/TestSuite_dual_vlan.py
new file mode 100644
index 0000000000..095e57bc56
--- /dev/null
+++ b/dts/tests/TestSuite_dual_vlan.py
@@ -0,0 +1,281 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 University of New Hampshire
+
+"""Dual VLAN functionality testing suite.
+
+The main objective of this test suite is to ensure that standard VLAN
functions such as stripping,
+filtering, and inserting all still carry out their expected behavior in the
presence of a packet
+which contains two VLAN headers. These functions should carry out said
behavior not just in
+isolation, but also when other VLAN functions are configured on the same port.
In addition to this,
+the priority attributes of VLAN headers should be unchanged in the case of
multiple VLAN headers
+existing on a single packet.
+"""
+import time
+from enum import Flag, auto
+from typing import ClassVar
+
+from scapy.layers.l2 import Dot1Q, Ether # type: ignore[import-untyped]
+from scapy.packet import Packet, Raw # type: ignore[import-untyped]
+
+from framework.params.testpmd import SimpleForwardingModes
+from framework.remote_session.testpmd_shell import TestPmdShell
+from framework.test_suite import TestSuite
+
+
+class TestDualVlan(TestSuite):
+ """DPDK Dual VLAN test suite.
+
+ This suite tests the behavior of VLAN functions and properties in the
presence of two VLAN
+ headers. All VLAN functions which are tested in this suite are specified
using the inner class
+ :class:`TestCaseOptions` and should have cases for configuring them in
+ :meth:`configure_testpmd` as well as cases for testing their behavior in
+ :meth:`verify_vlan_functions`. Every combination of VLAN functions being
enabled should be
+ tested. Additionally, attributes of VLAN headers, such as priority, are
tested to ensure they
+ are not modified in the case of two VLAN headers.
+ """
+
+ class TestCaseOptions(Flag):
+ """Flag for specifying which VLAN functions to configure."""
+
+ #:
+ VLAN_STRIP = auto()
+ #:
+ VLAN_FILTER_INNER = auto()
+ #:
+ VLAN_FILTER_OUTER = auto()
+ #:
+ VLAN_INSERT = auto()
+
+ #: ID to set on inner VLAN tags.
+ inner_vlan_tag: ClassVar[int] = 2
+ #: ID to set on outer VLAN tags.
+ outer_vlan_tag: ClassVar[int] = 1
+ #: ID to use when inserting VLAN tags.
+ vlan_insert_tag: ClassVar[int] = 3
+ #:
+ rx_port: ClassVar[int] = 0
+ #:
+ tx_port: ClassVar[int] = 1
+
+ def is_relevant_packet(self, pkt: Packet) -> bool:
+ """Check if a packet was sent by functions in this suite.
+
+ All functions in this test suite send packets with a payload that is
packed with 20 "X"
+ characters. This method, therefore, can determine if the packet was
sent by this test suite
+ by just checking to see if this payload exists on the received packet.
+
+ Args:
+ pkt: Packet to check for relevancy.
+
+ Returns:
+ :data:`True` if the packet contains the expected payload,
:data:`False` otherwise.
+ """
+ return hasattr(pkt, "load") and "X" * 20 in str(pkt.load)
+
+ def pkt_payload_contains_layers(self, pkt: Packet, *expected_layers:
Dot1Q) -> bool:
+ """Verify that the payload of the packet matches `expected_layers`.
+
+ The layers in the payload of `pkt` must match the type and the
user-defined fields of the
+ layers in `expected_layers` in order.
+
+ Args:
+ pkt: Packet to check the payload of.
+ *expected_layers: Layers expected to be in the payload of `pkt`.
+
+ Returns:
+ :data:`True` if the payload of `pkt` matches the layers in
`expected_layers` in order,
+ :data:`False` otherwise.
+ """
+ current_pkt_layer = pkt.payload
+ ret = True
+ for layer in expected_layers:
+ ret &= isinstance(current_pkt_layer, type(layer))
+ if not ret:
+ break
+ for field, val in layer.fields.items():
+ ret &= (
+ hasattr(current_pkt_layer, field) and
getattr(current_pkt_layer, field) == val
+ )
+ current_pkt_layer = current_pkt_layer.payload
+ return ret
+
+ def verify_vlan_functions(self, send_packet: Packet, options:
TestCaseOptions) -> None:
+ """Send packet and verify the received packet has the expected
structure.
+
+ Expected structure is defined by `options` according to the following
table:
+
+----------------------------------------------+-----------------------+
+ | Configure setting | Result
|
+
+=======+=======+========+============+========+=======+=======+=======+
+ | Outer | Inner | Vlan | Vlan | Vlan | Pass/ | Outer | Inner
|
+ | vlan | vlan | strip | filter | insert | Drop | vlan | vlan
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | no | no | no | pass | 0x1 | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | yes | no | no | pass | no | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | no | yes,0x1 | no | pass | 0x1 | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | no | yes,0x2 | no | pass | 0x1 | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | no | yes,0x1,0x2| no | pass | 0x1 | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | yes | yes,0x1 | no | pass | no | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | yes | yes,0x2 | no | pass | no | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | yes | yes,0x1,0x2| no | pass | no | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | no | no | yes | pass | 0x3 | 0x1
|
+ | | | | | | | | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | yes | no | yes | pass | 0x3 | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | no | yes,0x1 | yes | pass | 0x3 | 0x1
|
+ | | | | | | | | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | no | yes,0x2 | yes | pass | 0x3 | 0x1
|
+ | | | | | | | | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | no | yes,0x1,0x2| yes | pass | 0x3 | 0x1
|
+ | | | | | | | | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | yes | yes,0x1 | yes | pass | 0x3 | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | yes | yes,0x2 | yes | pass | 0x3 | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+ | 0x1 | 0x2 | yes | yes,0x1,0x2| yes | pass | 0x3 | 0x2
|
+
+-------+-------+--------+------------+--------+-------+-------+-------+
+
+ Args:
+ send_packet: Packet to send for testing.
+ options: Flag which defines the currents configured settings in
testpmd.
+ """
+ recv = self.send_packet_and_capture(send_packet)
+ recv = list(filter(self.is_relevant_packet, recv))
+ expected_layers: list[Packet] = []
+
+ if self.TestCaseOptions.VLAN_INSERT in options:
+ expected_layers.append(Dot1Q(vlan=self.vlan_insert_tag))
+
+ if self.TestCaseOptions.VLAN_STRIP not in options:
+ expected_layers.append(Dot1Q(vlan=self.outer_vlan_tag))
+ expected_layers.append(Dot1Q(vlan=self.inner_vlan_tag))
+
+ self.verify(
+ len(recv) > 0,
+ f"Expected to receive packet with the payload {expected_layers}
but got nothing.",
+ )
+
+ for pkt in recv:
+ self.verify(
+ self.pkt_payload_contains_layers(pkt, *expected_layers),
+ f"Received packet ({pkt.summary()}) did not match the expected
sequence of layers "
+ f"{expected_layers} with options {options}.",
+ )
+
+ def configure_testpmd(self, shell: TestPmdShell, options: TestCaseOptions,
add: bool) -> None:
+ """Configure VLAN functions in testpmd based on `options`.
+
+ Args:
+ shell: Testpmd session to configure the settings on. Expected to
already be running
+ with all ports stopped before being passed into this function.
+ options: Settings to modify in `shell`.
+ add: If :data:`True`, turn the settings in `options` on, otherwise
turn them off.
+ """
+ if (
+ self.TestCaseOptions.VLAN_FILTER_INNER in options
+ or self.TestCaseOptions.VLAN_FILTER_OUTER in options
+ ):
+ if add:
+ # If we are adding a filter, filtering has to be enabled first
+ shell.vlan_filter_set(self.rx_port, True)
+
+ if self.TestCaseOptions.VLAN_FILTER_INNER in options:
+ shell.rx_vlan(self.inner_vlan_tag, self.rx_port, add)
+ if self.TestCaseOptions.VLAN_FILTER_OUTER in options:
+ shell.rx_vlan(self.outer_vlan_tag, self.rx_port, add)
+
+ if not add:
+ # If we are removing filters then we need to remove the
filters before we can
+ # disable filtering.
+ shell.vlan_filter_set(self.rx_port, False)
+ if self.TestCaseOptions.VLAN_INSERT in options:
+ if add:
+ shell.tx_vlan_set(self.tx_port, self.vlan_insert_tag)
+ else:
+ shell.tx_vlan_reset(self.tx_port)
+ if self.TestCaseOptions.VLAN_STRIP in options:
+ shell.vlan_strip_set(self.rx_port, add)
+
+ def test_vlan_functions(self) -> None:
+ """Test that all combinations of :class:`TestCaseOptions` behave as
expected.
+
+ To test this, the base case is tested first, ensuring that a packet
with two VLANs is
+ unchanged without the VLAN modification functions enabled. Then the
same Testpmd shell is
+ modified to enable all necessary VLAN functions, followed by
verification that the
+ functions work as expected, and finally the functions are disabled to
allow for a clean
+ environment for the next test.
+ """
+ send_pakt = (
+ Ether()
+ / Dot1Q(vlan=self.outer_vlan_tag)
+ / Dot1Q(vlan=self.inner_vlan_tag)
+ / Raw("X" * 20)
+ )
+ testpmd = TestPmdShell(self.sut_node,
forward_mode=SimpleForwardingModes.mac)
+ testpmd.start()
+ recv = self.send_packet_and_capture(send_pakt)
+ self.verify(len(recv) > 0, "Unmodified packet was not received.")
+ self.verify(
+ any(
+ self.is_relevant_packet(p)
+ and self.pkt_payload_contains_layers(
+ p, *[Dot1Q(vlan=self.outer_vlan_tag),
Dot1Q(vlan=self.inner_vlan_tag)]
+ )
+ for p in recv
+ ),
+ "Packet was modified without any VLAN functions applied.",
+ )
+ testpmd.stop()
+ testpmd.port_stop_all()
+ for i in range(2 ** len(self.TestCaseOptions)):
+ options = self.TestCaseOptions(i)
+ self.configure_testpmd(testpmd, options, True)
+ testpmd.port_start_all()
+ testpmd.start()
+ self.verify_vlan_functions(send_pakt, options)
+ testpmd.stop()
+ testpmd.port_stop_all()
+ self.configure_testpmd(testpmd, options, False)
+
+ testpmd.close()
+ time.sleep(5)
+
+ def test_maintains_priority(self) -> None:
+ """Test that priorities of multiple VLAN tags are preserved by the
PMD."""
+ pakt = (
+ Ether()
+ / Dot1Q(vlan=self.outer_vlan_tag, prio=1)
+ / Dot1Q(vlan=self.inner_vlan_tag, prio=2)
+ / Raw("X" * 20)
+ )
+ testpmd = TestPmdShell(self.sut_node,
forward_mode=SimpleForwardingModes.mac)
+ testpmd.start()
+ recv = self.send_packet_and_capture(pakt)
+ self.verify(len(recv) > 0, "Did not receive and packets when testing
VLAN priority.")
+ self.verify(
+ any(
+ self.is_relevant_packet(p)
+ and self.pkt_payload_contains_layers(
+ p,
+ *[
+ Dot1Q(vlan=self.outer_vlan_tag, prio=1),
+ Dot1Q(vlan=self.inner_vlan_tag, prio=2),
+ ],
+ )
+ for p in recv
+ ),
+ "Vlan headers did not maintain their priorities.",
+ )
+ testpmd.close()
+ time.sleep(5)
--
2.45.2
