[RFC,v3,2/5] dts: parameterize what ports the TG sends packets to
Checks
Commit Message
From: Jeremy Spewock <jspewock@iol.unh.edu>
Previously in the DTS framework the helper methods in the TestSuite
class designated ports as either ingress or egress ports and would wrap
the methods of the traffic generator to allow packets to only flow to
those designated ingress or egress ports. This is undesirable in some
cases, such as when you have virtual functions on top of your port,
where the TG ports can send to more than one SUT port. This patch
solves this problem by creating optional parameters that allow the user
to specify which port to gather the MAC addresses from when sending and
receiving packets.
Signed-off-by: Jeremy Spewock <jspewock@iol.unh.edu>
---
dts/framework/test_suite.py | 38 ++++++++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 7 deletions(-)
@@ -185,6 +185,8 @@ def send_packet_and_capture(
packet: Packet,
filter_config: PacketFilteringConfig = PacketFilteringConfig(),
duration: float = 1,
+ sut_ingress: Port | None = None,
+ sut_egress: Port | None = None,
) -> list[Packet]:
"""Send and receive `packet` using the associated TG.
@@ -195,11 +197,19 @@ def send_packet_and_capture(
packet: The packet to send.
filter_config: The filter to use when capturing packets.
duration: Capture traffic for this amount of time after sending `packet`.
+ sut_ingress: Optional port to use as the SUT ingress port. Defaults to
+ `self._sut_port_ingress`.
+ sut_egress: Optional port to use as the SUT egress port. Defaults to
+ `self._sut_port_egress`
Returns:
A list of received packets.
"""
- packet = self._adjust_addresses(packet)
+ if sut_ingress is None:
+ sut_ingress = self._sut_port_ingress
+ if sut_egress is None:
+ sut_egress = self._sut_port_egress
+ packet = self._adjust_addresses(packet, sut_ingress, sut_egress)
return self.tg_node.send_packet_and_capture(
packet,
self._tg_port_egress,
@@ -208,18 +218,30 @@ def send_packet_and_capture(
duration,
)
- def get_expected_packet(self, packet: Packet) -> Packet:
+ def get_expected_packet(
+ self, packet: Packet, sut_ingress: Port | None = None, sut_egress: Port | None = None
+ ) -> Packet:
"""Inject the proper L2/L3 addresses into `packet`.
Args:
packet: The packet to modify.
+ sut_ingress: Optional port to use as the SUT ingress port. Defaults to
+ `self._sut_port_ingress`.
+ sut_egress: Optional port to use as the SUT egress port. Defaults to
+ `self._sut_port_egress`.
Returns:
`packet` with injected L2/L3 addresses.
"""
- return self._adjust_addresses(packet, expected=True)
-
- def _adjust_addresses(self, packet: Packet, expected: bool = False) -> Packet:
+ if sut_ingress is None:
+ sut_ingress = self._sut_port_ingress
+ if sut_egress is None:
+ sut_egress = self._sut_port_egress
+ return self._adjust_addresses(packet, sut_ingress, sut_egress, expected=True)
+
+ def _adjust_addresses(
+ self, packet: Packet, sut_ingress_port: Port, sut_egress_port: Port, expected: bool = False
+ ) -> Packet:
"""L2 and L3 address additions in both directions.
Assumptions:
@@ -229,11 +251,13 @@ def _adjust_addresses(self, packet: Packet, expected: bool = False) -> Packet:
packet: The packet to modify.
expected: If :data:`True`, the direction is SUT -> TG,
otherwise the direction is TG -> SUT.
+ sut_ingress_port: The port to use as the Rx port on the SUT.
+ sut_egress_port: The port to use as the Tx port on the SUT.
"""
if expected:
# The packet enters the TG from SUT
# update l2 addresses
- packet.src = self._sut_port_egress.mac_address
+ packet.src = sut_egress_port.mac_address
packet.dst = self._tg_port_ingress.mac_address
# The packet is routed from TG egress to TG ingress
@@ -244,7 +268,7 @@ def _adjust_addresses(self, packet: Packet, expected: bool = False) -> Packet:
# The packet leaves TG towards SUT
# update l2 addresses
packet.src = self._tg_port_egress.mac_address
- packet.dst = self._sut_port_ingress.mac_address
+ packet.dst = sut_ingress_port.mac_address
# The packet is routed from TG egress to TG ingress
# update l3 addresses