From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8A7B745564; Wed, 3 Jul 2024 23:58:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9ACE427C1; Wed, 3 Jul 2024 23:58:48 +0200 (CEST) Received: from mail-qt1-f231.google.com (mail-qt1-f231.google.com [209.85.160.231]) by mails.dpdk.org (Postfix) with ESMTP id 40EBD427C1 for ; Wed, 3 Jul 2024 23:58:48 +0200 (CEST) Received: by mail-qt1-f231.google.com with SMTP id d75a77b69052e-446340c6608so43242401cf.1 for ; Wed, 03 Jul 2024 14:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1720043927; x=1720648727; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m1mXm1hNYRl8aBZJIIaHZ3HCBzOzWo1ODYQwY+sFpo0=; b=iJTybieK3XMBRQEmNEiCikp71zmqpgws4uQYco8DQW8mzmtBDMI8RlE+WwG/KlWEo+ wUbg5Pk1cKaq0xdDbgoSz22z80rDEoX51IPpTHD9iP1h2QJHtgjsdNTPMBEZPK5l+gM3 erKB405KquK+22J9z1iFLv0oCZWw+XowNNHNY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720043927; x=1720648727; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m1mXm1hNYRl8aBZJIIaHZ3HCBzOzWo1ODYQwY+sFpo0=; b=RCZ3O4B4KXOs4w26VCSxqJJQOsDt3zIhzFHkzDVT8idsTR8nTSS5naCC4R+a4AMAmJ PRA+Ku8pW3epUXTCWVKWH/ePFDro/KQNbIb6yeIFuWnqxw9EfOYelBrIFLbQvzvLtLjK rwrDXFaKp1kMSEw+HK3XOz2trPdUFnHNkj+ZYt1UbJrSLPsIu6aZT+9DmC0GW/5VMNX9 oM/eH97eveTQuOETCCsLS+6wgbrHJ0+uVn/i5ntywLmz9gAVsNkpCFnOiJJPtDCvayfE DlbjmknSfQgJk3CdFjPlEiz3NfPhHi7S/FhBh9E/cmZPtgyQkdoxspEeyJsTsHICmZ/p WytA== X-Gm-Message-State: AOJu0YyskEEXa5uxKWB8Fq0PmTC4XiIi3bQH5eFK53g7sO8lfR+yNnIA owb39e378e/bMom5zKL/WMMVOKj+td0+PoaBxLRpk7uAMI+xGOkJUF9f3+vDW0Dzv5XbnGcBUet 0wiFd/+2Zmuqc1TOEI+8BxOrNJmbYXlkM X-Google-Smtp-Source: AGHT+IEXG7aPBKdHoDcTlM+/t9j8KkJtFKmLH9Bg/eEF3yhRCXTNFFjZ6PS6cQf1d+cn9M81KaFcthITBdrG X-Received: by 2002:a05:622a:44d:b0:440:8d11:d0c5 with SMTP id d75a77b69052e-44662e534f2mr161152821cf.57.1720043927555; Wed, 03 Jul 2024 14:58:47 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id d75a77b69052e-446513d6f5csm2260991cf.9.2024.07.03.14.58.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jul 2024 14:58:47 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Received: from iol.unh.edu (unknown [IPv6:2606:4100:3880:1257::1083]) by postal.iol.unh.edu (Postfix) with ESMTP id B9450605C351; Wed, 3 Jul 2024 17:58:46 -0400 (EDT) From: jspewock@iol.unh.edu To: npratte@iol.unh.edu, Luca.Vizzarro@arm.com, thomas@monjalon.net, yoan.picchi@foss.arm.com, wathsala.vithanage@arm.com, probb@iol.unh.edu, Honnappa.Nagarahalli@arm.com, juraj.linkes@pantheon.tech, paul.szczepanek@arm.com Cc: dev@dpdk.org, Jeremy Spewock Subject: [PATCH v2 1/4] dts: add send_packets to test suites and rework packet addressing Date: Wed, 3 Jul 2024 17:58:25 -0400 Message-ID: <20240703215828.80079-2-jspewock@iol.unh.edu> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240703215828.80079-1-jspewock@iol.unh.edu> References: <20240625155332.2400-1-jspewock@iol.unh.edu> <20240703215828.80079-1-jspewock@iol.unh.edu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Jeremy Spewock 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 --- dts/framework/test_suite.py | 74 ++++++++++++++++++-------- dts/framework/testbed_model/tg_node.py | 9 ++++ 2 files changed, 62 insertions(+), 21 deletions(-) diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py index 694b2eba65..0b678ed62d 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`. @@ -219,39 +231,59 @@ def get_expected_packet(self, packet: Packet) -> Packet: """ return self._adjust_addresses(packet, expected=True) - 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. + Only missing addresses are added to packets, existing addressed will not be overridden. + Assumptions: Two links between SUT and TG, one link is TG -> SUT, the other SUT -> TG. Args: - packet: The packet to modify. + packets: The packets to modify. expected: If :data:`True`, the direction is SUT -> TG, otherwise the direction is TG -> SUT. """ - if expected: - # The packet enters the TG from SUT - # update l2 addresses - packet.src = self._sut_port_egress.mac_address - packet.dst = self._tg_port_ingress.mac_address + ret_packets = [] + for packet in packets: + default_pkt_src = type(packet)().src + default_pkt_dst = type(packet)().dst + default_pkt_payload_src = IP().src if hasattr(packet.payload, "src") else None + default_pkt_payload_dst = IP().dst if hasattr(packet.payload, "dst") else None + # If `expected` is :data:`True`, the packet enters the TG from SUT, otherwise the + # packet leaves the TG towards the SUT - # The packet is routed from TG egress to TG ingress - # update l3 addresses - packet.payload.src = self._tg_ip_address_egress.ip.exploded - packet.payload.dst = self._tg_ip_address_ingress.ip.exploded - else: - # 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 + if packet.src == default_pkt_src: + packet.src = ( + self._sut_port_egress.mac_address + if expected + else self._tg_port_egress.mac_address + ) + if packet.dst == default_pkt_dst: + packet.dst = ( + self._tg_port_ingress.mac_address + if expected + else self._sut_port_ingress.mac_address + ) + + # The packet is routed from TG egress to TG ingress regardless of if it is expected or + # not. - # The packet is routed from TG egress to TG ingress # update l3 addresses - packet.payload.src = self._tg_ip_address_egress.ip.exploded - packet.payload.dst = self._tg_ip_address_ingress.ip.exploded - - return Ether(packet.build()) + if ( + default_pkt_payload_src is not None + and packet.payload.src == default_pkt_payload_src + ): + packet.payload.src = self._tg_ip_address_egress.ip.exploded + if ( + default_pkt_payload_dst is not None + and packet.payload.dst == default_pkt_payload_dst + ): + packet.payload.dst = self._tg_ip_address_ingress.ip.exploded + ret_packets.append(Ether(packet.build())) + + return ret_packets def verify(self, condition: bool, failure_description: str) -> None: """Verify `condition` and handle failures. diff --git a/dts/framework/testbed_model/tg_node.py b/dts/framework/testbed_model/tg_node.py index 4ee326e99c..758b676258 100644 --- a/dts/framework/testbed_model/tg_node.py +++ b/dts/framework/testbed_model/tg_node.py @@ -83,6 +83,15 @@ def send_packet_and_capture( duration, ) + def send_packets(self, packets: list[Packet], port: Port): + """Send packets without capturing resulting received packets. + + Args: + packets: Packets to send. + port: Port to send the packets on. + """ + self.traffic_generator.send_packets(packets, port) + def close(self) -> None: """Free all resources used by the node. -- 2.45.2