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 7A95D459CF; Wed, 18 Sep 2024 21:41:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AE704026F; Wed, 18 Sep 2024 21:41:13 +0200 (CEST) Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by mails.dpdk.org (Postfix) with ESMTP id 8F7504003C for ; Wed, 18 Sep 2024 21:41:11 +0200 (CEST) Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-7a9af813f6cso5710185a.3 for ; Wed, 18 Sep 2024 12:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1726688471; x=1727293271; 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=d6rOhGeG0NbgknDt7szBtH1FExJA5WihZDbqwqFldR0=; b=f3m6tuAvH7aZ4ru/BMcr1AyCbcuqNwTtdX26JPR6qjCbgFhjXAesaJGwtas5mPzRBy 4kz3IVaXrEjyvcoxD+H1GiJqGXohYOt6pX4Wgp+/T/IaPqD7srSMDNKbL2592H4HoV4j 892SGwIB40haWPwJk+EoF5NAr25mRlhB4V8lI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726688471; x=1727293271; 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=d6rOhGeG0NbgknDt7szBtH1FExJA5WihZDbqwqFldR0=; b=cZYzgjWVYTu96SssQVKMbH5BQM6S4U1U3inKkjclhIeZ/nK8+c3rmEBLvdNGXA039i uxnSfmFF2sl6Dx0IQ/Ip6WAlyzY4V66As00dDt9rfsbNL4mHOmh6qeBfGU8aqsv/Qvgh lOoQdEjTfwN6UP73l62d5Dke4tKP8iWgtL1iTIINY3lJVRRrKgnHbFNAsUvBXTTcJNgd x/oBLpTkCQcprdCB7OnGFEg0utBmX0YNQxOaRGYEBYLnZK/Ddxrw/81ymEcyIzQmEJ+X agSuqj6eIldDkTM8s4wDjw+TUh4YRla+qIhcdy240RErAalbzcDq1MCOKzu7T33/WaKk wcbg== X-Gm-Message-State: AOJu0YyZCGwZQz440ct655IbdBUDZcfdmgbjRwjSVjU8pJikKnQri5Z9 p6p/2xp8yRkLYlEui0Bj+I4jzyWy2kksZa3t1H3DzYi38iE7LjBfqNNPCZo4yR8= X-Google-Smtp-Source: AGHT+IFLDv3F6CckOTSZDkfbfidy4D5ODYstG4+EZeXlkmgX95s7JsIvH+ix1sveE6L3pBCtBzEMOQ== X-Received: by 2002:a05:620a:4729:b0:7a9:a3e3:7282 with SMTP id af79cd13be357-7a9e5ee721cmr3466078585a.2.1726688470661; Wed, 18 Sep 2024 12:41:10 -0700 (PDT) Received: from dean-laptop.iol.unh.edu ([2606:4100:3880:1271:f9bd:24da:464d:6294]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45b178f2dd6sm432681cf.74.2024.09.18.12.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 12:41:10 -0700 (PDT) From: Dean Marx To: probb@iol.unh.edu, npratte@iol.unh.edu, jspewock@iol.unh.edu, luca.vizzarro@arm.com, yoan.picchi@foss.arm.com, Honnappa.Nagarahalli@arm.com, paul.szczepanek@arm.com, juraj.linkes@pantheon.tech Cc: dev@dpdk.org, Dean Marx Subject: [PATCH v2] dts: add VLAN methods to testpmd shell Date: Wed, 18 Sep 2024 15:41:27 -0400 Message-ID: <20240918194127.11556-1-dmarx@iol.unh.edu> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240911173801.16538-1-dmarx@iol.unh.edu> References: <20240911173801.16538-1-dmarx@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 added the following methods to testpmd shell class: vlan set filter on/off, rx vlan add/rm, vlan set strip on/off, tx vlan set/reset, set promisc/verbose Fixes: 61d5bc9bf974 ("dts: add port info command to testpmd shell") Signed-off-by: Dean Marx --- dts/framework/remote_session/testpmd_shell.py | 175 +++++++++++++++++- 1 file changed, 174 insertions(+), 1 deletion(-) diff --git a/dts/framework/remote_session/testpmd_shell.py b/dts/framework/remote_session/testpmd_shell.py index 8c228af39f..5c5e681841 100644 --- a/dts/framework/remote_session/testpmd_shell.py +++ b/dts/framework/remote_session/testpmd_shell.py @@ -102,7 +102,7 @@ def make_parser(cls) -> ParserFn: r"strip (?Pon|off), " r"filter (?Pon|off), " r"extend (?Pon|off), " - r"qinq strip (?Pon|off)$", + r"qinq strip (?Pon|off)", re.MULTILINE, named=True, ), @@ -982,6 +982,179 @@ def set_port_mtu_all(self, mtu: int, verify: bool = True) -> None: for port in self.ports: self.set_port_mtu(port.id, mtu, verify) + def vlan_filter_set(self, port: int, on: bool, verify: bool = True) -> None: + """Set vlan filter on. + + Args: + port: The port number to enable VLAN filter on, should be within 0-32. + on: Sets filter on if :data:`True`, otherwise turns off. + 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' if on else 'off'} {port}") + if verify: + vlan_settings = self.show_port_info(port_id=port).vlan_offload + if on ^ (vlan_settings is not None and VLANOffloadFlag.FILTER in vlan_settings): + self._logger.debug(f"Failed to set filter on port {port}: \n{filter_cmd_output}") + raise InteractiveCommandExecutionError( + f"Testpmd failed to set VLAN filter on port {port}." + ) + + def rx_vlan(self, vlan: int, port: int, add: bool, verify: bool = True) -> None: + """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. + add: Adds the tag if :data:`True`, otherwise removes tag. + 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. + """ + rx_output = self.send_command(f"rx_vlan {'add' if add else 'rm'} {vlan} {port}") + if verify: + if ( + "VLAN-filtering disabled" in rx_output + or "Invalid vlan_id" in rx_output + or "Bad arguments" in rx_output + ): + self._logger.debug( + f"Failed to {'add' if add else 'remove'} tag {vlan} port {port}: \n{rx_output}" + ) + raise InteractiveCommandExecutionError( + f"Testpmd failed to {'add' if add else 'remove'} tag {vlan} on port {port}." + ) + + def vlan_strip_set(self, port: int, on: bool, verify: bool = True) -> None: + """Enable vlan stripping on the specified port. + + Args: + port: The port number to use, should be within 0-32. + on: If :data:`True`, will turn strip on, otherwise will turn off. + verify: If :data:`True`, the output of the command and show port info + is scanned to verify that vlan stripping was enabled on the specified port. + If not, it is considered an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and stripping + fails to update. + """ + strip_output = self.send_command(f"vlan set strip {'on' if on else 'off'} {port}") + if verify: + vlan_settings = self.show_port_info(port_id=port).vlan_offload + if on ^ (vlan_settings is not None and VLANOffloadFlag.STRIP in vlan_settings): + self._logger.debug( + f"Failed to set strip {'on' if on else 'off'} port {port}: \n{strip_output}" + ) + raise InteractiveCommandExecutionError( + f"Testpmd failed to set strip {'on' if on else 'off'} port {port}." + ) + + def tx_vlan_set(self, port: int, vlan: int, verify: bool = True) -> None: + """Set hardware insertion of vlan tags in packets sent on a port. + + Args: + port: The port number to use, should be within 0-32. + vlan: The vlan tag to insert, should be within 1-4094. + verify: If :data:`True`, the output of the command is scanned to verify that + vlan insertion was enabled on the specified port. If not, it is + considered an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the insertion + tag is not set. + """ + vlan_insert_output = self.send_command(f"tx_vlan set {port} {vlan}") + if verify: + if ( + "Please stop port" in vlan_insert_output + or "Invalid vlan_id" in vlan_insert_output + or "Invalid port" in vlan_insert_output + ): + self._logger.debug( + f"Failed to set vlan tag {vlan} on port {port}:\n{vlan_insert_output}" + ) + raise InteractiveCommandExecutionError( + f"Testpmd failed to set vlan insertion tag {vlan} on port {port}." + ) + + def tx_vlan_reset(self, port: int, verify: bool = True) -> None: + """Disable hardware insertion of vlan tags in packets sent on a port. + + Args: + port: The port number to use, should be within 0-32. + verify: If :data:`True`, the output of the command is scanned to verify that + vlan insertion was disabled on the specified port. If not, it is + considered an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the insertion + tag is not reset. + """ + vlan_insert_output = self.send_command(f"tx_vlan reset {port}") + if verify: + if "Please stop port" in vlan_insert_output or "Invalid port" in vlan_insert_output: + self._logger.debug( + f"Failed to reset vlan insertion on port {port}: \n{vlan_insert_output}" + ) + raise InteractiveCommandExecutionError( + f"Testpmd failed to reset vlan insertion on port {port}." + ) + + def set_promisc(self, port: int, on: bool, verify: bool = True) -> None: + """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 set_verbose(self, level: int, verify: bool = True) -> None: + """Set debug verbosity level. + + Args: + level: 0 - silent except for error + 1 - fully verbose except for Tx packets + 2 - fully verbose except for Rx packets + >2 - fully verbose + verify: If :data:`True` the command output will be scanned to verify that verbose level + is properly set. Defaults to :data:`True`. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and verbose level + is not correctly set. + """ + verbose_output = self.send_command(f"set verbose {level}") + if verify: + if "Change verbose level" not in verbose_output: + self._logger.debug(f"Failed to set verbose level to {level}: \n{verbose_output}") + raise InteractiveCommandExecutionError( + f"Testpmd failed to set verbose level to {level}." + ) + def _close(self) -> None: """Overrides :meth:`~.interactive_shell.close`.""" self.stop() -- 2.44.0