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 A387945550; Tue, 2 Jul 2024 20:58:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 901A440E21; Tue, 2 Jul 2024 20:58:16 +0200 (CEST) Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by mails.dpdk.org (Postfix) with ESMTP id 4B61A40E1D for ; Tue, 2 Jul 2024 20:58:15 +0200 (CEST) Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-6b5de481b20so364346d6.2 for ; Tue, 02 Jul 2024 11:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1719946694; x=1720551494; 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=uoa3l3TMDmjJvobPnV93zFuKgSiIIeVDMoJy44hR+BI=; b=K7xRU8qDilmSs5Nixx3qQVET4yPTsCrrgYCXaZr3NIODHpgsMII8OnZKpAcWr2ujk8 m/vNSpfcQkw2Xa341umUC+oUEyaOyg+KUCDyOsP3df+wIM9TNLGOmkMl/iBBzBCXjzZX Kcyv07TV5rO+SUQ5g3y7zwk9mEGHTyeTD7WJU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719946694; x=1720551494; 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=uoa3l3TMDmjJvobPnV93zFuKgSiIIeVDMoJy44hR+BI=; b=IhweCRILqmd5B5FIbniyD8zS2+1AWQIBVWHv+GOvo2FCiqoOBKvtoR3hZdp/n8/Bdm Atn2QycUZQemOhBh4By6kHBq7LC74x+2hO6+bBqXdCVWSexzh/rBKNyySBK2xx3ThHOa jjOrosiopTbXKvCRPaQZOT9jaP+lszBCTCPtbFqKHu4/BjY0umxmr210HmWSZB6ISlAH MRBe7j+GC5bWJSPdpRWVIzNswgTGEkm+cMz6zVwGY3vk1j0ELvFt9bFD9mjBNV75NFYb Ry5K8vVHYYsST9n+dhLmOa/2RFils5Uuwvw/tqmA/EWgCN8VJuNflaCn3l1s+MV0mNhO u3og== X-Gm-Message-State: AOJu0Ywt0EMye9/ZvHQ/E3qkF9fyWb9C0oD6AJAN9z1j9UoOxE9gCBZq rYcGKDenouxIWUk1O8gaKvHekHDJo5zw1Fus/h86oc9AMLC4jMFDCoAPu+SfcGg= X-Google-Smtp-Source: AGHT+IEtzMTEn5s8SFOjt1Z3pHjnzEDTZeVi64wK3pWJUXMvEA5OPpPBp/q2G9vh0qxTCgO4Wzl0qw== X-Received: by 2002:ae9:f401:0:b0:79d:6685:4e6e with SMTP id af79cd13be357-79d7b9c08bfmr868687985a.2.1719946694540; Tue, 02 Jul 2024 11:58:14 -0700 (PDT) Received: from localhost.unh.edu ([2606:4100:3880:1271:e2f8:4ec3:8bf3:864c]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d692611c0sm485295185a.19.2024.07.02.11.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 11:58:14 -0700 (PDT) From: Nicholas Pratte To: dmarx@iol.unh.edu, juraj.linkes@pantheon.tech, Honnappa.Nagarahalli@arm.com, yoan.picchi@foss.arm.com, bruce.richardson@intel.com, luca.vizzarro@arm.com, jspewock@iol.unh.edu, probb@iol.unh.edu, paul.szczepanek@arm.com Cc: dev@dpdk.org, Nicholas Pratte Subject: [PATCH v2 2/3] dts: add methods for setting mac and multicast addresses Date: Tue, 2 Jul 2024 14:56:50 -0400 Message-ID: <20240702185648.24741-6-npratte@iol.unh.edu> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240621172059.8194-2-npratte@iol.unh.edu> References: <20240621172059.8194-2-npratte@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 Several new methods have been added to TestPMDShell in order to produce the mac filter's individual test cases: - set_mac_addr - set_multicast_mac_addr - rx_vlan_add - rx_vlan_rm - vlan_filter_set_on - vlan_filter_set_off - set_promisc set_mac_addr and set_multicast_addr were created for the mac filter test suite, enabling users to both add or remove mac and multicast addresses based on a booling 'add or remove' parameter. The success or failure of each call can be verified if a user deems it necessary. The other methods listed are implemented in other respective test suites, and their implementations have been copied, but are subject to change; they are not the focus of this patch. Bugzilla ID: 1454 Signed-off-by: Nicholas Pratte --- dts/framework/remote_session/testpmd_shell.py | 177 ++++++++++++++++++ dts/tests/TestSuite_mac_filter.py | 0 2 files changed, 177 insertions(+) create mode 100644 dts/tests/TestSuite_mac_filter.py diff --git a/dts/framework/remote_session/testpmd_shell.py b/dts/framework/remote_session/testpmd_shell.py index ec22f72221..0be1fb8754 100644 --- a/dts/framework/remote_session/testpmd_shell.py +++ b/dts/framework/remote_session/testpmd_shell.py @@ -767,6 +767,183 @@ def show_port_info(self, port_id: int) -> TestPmdPort: return TestPmdPort.parse(output) + def set_mac_addr(self, port_id: int, mac_address: str, add: bool, verify: bool = True): + """Add or remove a mac address on a given port's Allowlist. + + Args: + port_id: The port ID the mac address is set on. + mac_address: The mac address to be added or removed to the specified port. + add: If :data:`True`, add the specified mac address. If :data:`False`, remove specified + mac address. + verify: If :data:'True', assert that the 'mac_addr' operation was successful. If + :data:'False', run the command and skip this assertion. + + Raises: + InteractiveCommandExecutionError: If the set mac address operation fails. + """ + mac_cmd = "add" if add else "remove" + output = self.send_command(f"mac_addr {mac_cmd} {port_id} {mac_address}") + if "Bad arguments" in output: + self._logger.debug("Invalid argument provided to mac_addr") + raise InteractiveCommandExecutionError("Invalid argument provided") + + if verify: + if "mac_addr_cmd error:" in output: + self._logger.debug(f"Failed to {mac_cmd} {mac_address} on port {port_id}") + raise InteractiveCommandExecutionError( + f"Failed to {mac_cmd} {mac_address} on port {port_id} \n{output}" + ) + + def set_multicast_mac_addr(self, port_id: int, multi_addr: str, add: bool, verify: bool = True): + """Add or remove multicast mac address to a specified port filter. + + Args: + port_id: The port ID the multicast address is set on. + multi_addr: The multicast address to be added to the filter. + add: If :data:'True', add the specified multicast address to the port filter. + If :data:'False', remove the specified multicast address from the port filter. + verify: If :data:'True', assert that the 'mcast_addr' operations was successful. + If :data:'False', execute the 'mcast_addr' operation and skip the assertion. + + Raises: + InteractiveCommandExecutionError: If either the 'add' or 'remove' operations fails. + """ + mcast_cmd = "add" if add else "remove" + output = self.send_command(f"mcast_addr {mcast_cmd} {port_id} {multi_addr}") + if "Bad arguments" in output: + self._logger.debug("Invalid arguments provided to mcast_addr") + raise InteractiveCommandExecutionError("Invalid argument provided") + + if verify: + if ( + "Invalid multicast_addr" in output + or f'multicast address {"already" if add else "not"} filtered by port' in output + ): + self._logger.debug(f"Failed to {mcast_cmd} {multi_addr} on port {port_id}") + raise InteractiveCommandExecutionError( + f"Failed to {mcast_cmd} {multi_addr} on port {port_id} \n{output}" + ) + + def rx_vlan_add(self, vlan: int, port: int, verify: bool = True): + """Add specified vlan tag to the filter list on a port. + + Args: + vlan: The vlan tag to add, should be within 1-1005, 1-4094 extended. + port: The port number to add the tag on, should be within 0-32. + verify: If :data:`True`, the output of the command is scanned to verify that + the vlan tag was added to the filter list on the specified port. If not, it is + considered an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the tag + is not added. + """ + vlan_add_output = self.send_command(f"rx_vlan add {vlan} {port}") + if verify: + if "VLAN-filtering disabled" in vlan_add_output or "Invalid vlan_id" in vlan_add_output: + self._logger.debug( + f"Failed to add vlan tag {vlan} on port {port}: \n{vlan_add_output}" + ) + raise InteractiveCommandExecutionError( + f"Testpmd failed to add vlan tag {vlan} on port {port}." + ) + + def rx_vlan_rm(self, vlan: int, port: int, verify: bool = True): + """Remove specified vlan tag from filter list on a port. + + Args: + vlan: The vlan tag to remove, should be within 1-4094. + port: The port number to remove the tag from, should be within 0-32. + verify: If :data:`True`, the output of the command is scanned to verify that + the vlan tag was removed from the filter list on the specified port. If not, it is + considered an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the tag + is not removed. + """ + vlan_rm_output = self.send_command(f"rx_vlan rm {vlan} {port}") + if verify: + if "VLAN-filtering disabled" in vlan_rm_output or "Invalid vlan_id" in vlan_rm_output: + self._logger.debug( + f"Failed to remove vlan tag {vlan} on port {port}: \n{vlan_rm_output}" + ) + raise InteractiveCommandExecutionError( + f"Testpmd failed to remove vlan tag {vlan} on port {port}." + ) + + def vlan_filter_set_on(self, port: int, verify: bool = True): + """Set vlan filter on. + + Args: + port: The port number to enable VLAN filter on, should be within 0-32. + verify: If :data:`True`, the output of the command and show port info + is scanned to verify that vlan filtering was enabled successfully. + If not, it is considered an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the filter + fails to update. + """ + filter_cmd_output = self.send_command(f"vlan set filter on {port}") + if verify: + if "Invalid port" in filter_cmd_output or "filter on" not in self.send_command( + f"show port info {port}" + ): + self._logger.debug( + f"Failed to enable vlan filter on port {port}: \n{filter_cmd_output}" + ) + raise InteractiveCommandExecutionError( + f"Testpmd failed to enable vlan filter on port {port}." + ) + + def vlan_filter_set_off(self, port: int, verify: bool = True): + """Set vlan filter off. + + Args: + port: The port number to disable VLAN filter on, should be within 0-32. + verify: If :data:`True`, the output of the command and show port info + is scanned to verify that vlan filtering was disabled successfully. + If not, it is considered an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the filter + fails to update. + """ + filter_cmd_output = self.send_command(f"vlan set filter off {port}") + if verify: + if "Invalid port" in filter_cmd_output or "filter off" not in self.send_command( + f"show port info {port}" + ): + self._logger.debug( + f"Failed to disable vlan filter on port {port}: \n{filter_cmd_output}" + ) + raise InteractiveCommandExecutionError( + f"Testpmd failed to disable vlan filter on port {port}." + ) + + def set_promisc(self, port: int, on: bool, verify: bool = True): + """Turns promiscuous mode on/off for the specified port. + + Args: + port: Port number to use, should be within 0-32. + on: If :data:`True`, turn promisc mode on, otherwise turn off. + verify: If :data:`True` an additional command will be sent to verify that promisc mode + is properly set. Defaults to :data:`True`. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and promisc mode + is not correctly set. + """ + promisc_output = self.send_command(f"set promisc {port} {'on' if on else 'off'}") + if verify: + stats = self.show_port_info(port_id=port) + if on ^ stats.is_promiscuous_mode_enabled: + self._logger.debug(f"Failed to set promisc mode on port {port}: \n{promisc_output}") + raise InteractiveCommandExecutionError( + f"Testpmd failed to set promisc mode on port {port}." + ) + def show_port_stats_all(self) -> list[TestPmdPortStats]: """Returns the statistics of all the ports. diff --git a/dts/tests/TestSuite_mac_filter.py b/dts/tests/TestSuite_mac_filter.py new file mode 100644 index 0000000000..e69de29bb2 -- 2.44.0