This looks good, except for the fact that a method for sending a list of packets has been added since you submitted this patch (which does return the packet list, not that it matters for your application).
So, this will need to be resubmitted with your patch reformatted for _adjust_addresses() to be used by luca's send_packet_and_capture -> send_packets_and_capture approach which is now in the framework. On Wed, Sep 4, 2024 at 11:28 AM <jspew...@iol.unh.edu> wrote: > > From: Jeremy Spewock <jspew...@iol.unh.edu> > > Currently the only method provided in the test suite class for sending > packets sends a single packet and then captures the results. There is, > in some cases, a need to send multiple packets at once while not really > needing to capture any traffic received back. The method to do this > exists in the traffic generator already, but this patch exposes the > method to test suites. > > This patch also updates the _adjust_addresses method of test suites so > that addresses of packets are only modified if the developer did not > configure them beforehand. This allows for developers to have more > control over the content of their packets when sending them through the > framework. > > Signed-off-by: Jeremy Spewock <jspew...@iol.unh.edu> > --- > dts/framework/test_suite.py | 87 +++++++++++++++++++------- > dts/framework/testbed_model/tg_node.py | 9 +++ > 2 files changed, 75 insertions(+), 21 deletions(-) > > diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py > index 694b2eba65..11aaa0a93a 100644 > --- a/dts/framework/test_suite.py > +++ b/dts/framework/test_suite.py > @@ -199,7 +199,7 @@ def send_packet_and_capture( > Returns: > A list of received packets. > """ > - packet = self._adjust_addresses(packet) > + packet = self._adjust_addresses([packet])[0] > return self.tg_node.send_packet_and_capture( > packet, > self._tg_port_egress, > @@ -208,6 +208,18 @@ def send_packet_and_capture( > duration, > ) > > + def send_packets( > + self, > + packets: list[Packet], > + ) -> None: > + """Send packets using the traffic generator and do not capture > received traffic. > + > + Args: > + packets: Packets to send. > + """ > + packets = self._adjust_addresses(packets) > + self.tg_node.send_packets(packets, self._tg_port_egress) > + > def get_expected_packet(self, packet: Packet) -> Packet: > """Inject the proper L2/L3 addresses into `packet`. > > @@ -217,41 +229,74 @@ def get_expected_packet(self, packet: Packet) -> Packet: > Returns: > `packet` with injected L2/L3 addresses. > """ > - return self._adjust_addresses(packet, expected=True) > + return self._adjust_addresses([packet], expected=True)[0] > > - def _adjust_addresses(self, packet: Packet, expected: bool = False) -> > Packet: > + def _adjust_addresses(self, packets: list[Packet], expected: bool = > False) -> list[Packet]: > """L2 and L3 address additions in both directions. ^Just confirming again I think this implementation is fine, the patch just needs to be reformatted to work on top of the new testsuite/tgnode pktgen methods. Cheers.
