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 547BE45523; Fri, 28 Jun 2024 16:00:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 177BE40F16; Fri, 28 Jun 2024 16:00:47 +0200 (CEST) Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by mails.dpdk.org (Postfix) with ESMTP id 8FBE040A71 for ; Fri, 28 Jun 2024 16:00:45 +0200 (CEST) Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-6adc63c2ee0so2589556d6.3 for ; Fri, 28 Jun 2024 07:00:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1719583245; x=1720188045; 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=7tn5SGETUtt68eO7ix0UAgmNp80ybG4UHqg/AlY7IvQ=; b=HTJlqACGSUCQlyVPrG5ieNRYmDrmKgBjY1QKhR5XDSKmGe+jKDjUWOIc5b0Qnq4EDc YBY4OPN+LgBJOQn1GGROl08CjC8wvoI+mq8GUV7MSApKAjwO1WdB0cUzQiICjaSKZbsn C5hf2uoFgA71zyATrWzsdGvPE2WuiPMl6kVa8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719583245; x=1720188045; 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=7tn5SGETUtt68eO7ix0UAgmNp80ybG4UHqg/AlY7IvQ=; b=DmENpre7swguUJT3SnznnEbFwsOfRHm/J9MTVqDSbi+Y0aBflUwXsAxRN80D0ztdEv VdVpOapeMp1BuQrOEKrh+EvCazuqOqmp+use/y7AaxoH86Iji7p9U0WVV1Bv9SYsxTh0 OJGw+Asz10K4/VrI4v/JSGDEdMVUhvnh0TYjasq9GBAKVnhchzy/blCD0jvQVTd7cxtF +fgXztNLVwySw2HyqhTwf8xxFwGHMcFG2IIYKB1nSY+E1mIdufZOmZijFGDqGpBZVwbB ytUOWnwugDJGXDgG8SBJg0I8jwz4YWb+8otHEY8EoEJxlkmtQPv5iWofwRX6gplSkVVQ EdFw== X-Gm-Message-State: AOJu0Yxg0dur+6S1FaLAppK40dQUlRspfk5aBojNSUNuJSpXRMRb+muU FIDWonwBqHot41VqZQ1Euxc2OjCWInwvdUQAeqhCFJV20Wgz7eb9HrhzIecjHDY= X-Google-Smtp-Source: AGHT+IE36qQKxJjEF3XSKm5vARR0IgU1yHVINOwTFet9Kf80BNbmWxyh4gtYT8xTp9o7TSoM/vgczQ== X-Received: by 2002:a05:6214:2aac:b0:6b5:23eb:3a49 with SMTP id 6a1803df08f44-6b5409c4ce5mr235802366d6.25.1719583244516; Fri, 28 Jun 2024 07:00:44 -0700 (PDT) Received: from dean-laptop.iol.unh.edu ([2606:4100:3880:1271:f9bd:24da:464d:6294]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b59e563afdsm8032896d6.37.2024.06.28.07.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jun 2024 07:00:44 -0700 (PDT) From: Dean Marx To: Honnappa.Nagarahalli@arm.com, juraj.linkes@pantheon.tech, probb@iol.unh.edu, paul.szczepanek@arm.com, yoan.picchi@foss.arm.com, jspewock@iol.unh.edu, bruce.richardson@intel.com, luca.vizzarro@arm.com Cc: dev@dpdk.org, Dean Marx Subject: [PATCH v8 1/3] dts: add VLAN methods to testpmd shell Date: Fri, 28 Jun 2024 10:00:08 -0400 Message-ID: <20240628140010.27425-1-dmarx@iol.unh.edu> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240614150238.26374-1-dmarx@iol.unh.edu> References: <20240614150238.26374-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, port stop/start all/port, tx vlan set/reset, set promisc/verbose Signed-off-by: Dean Marx --- dts/framework/remote_session/testpmd_shell.py | 271 ++++++++++++++++++ 1 file changed, 271 insertions(+) diff --git a/dts/framework/remote_session/testpmd_shell.py b/dts/framework/remote_session/testpmd_shell.py index ec22f72221..2a3a194b54 100644 --- a/dts/framework/remote_session/testpmd_shell.py +++ b/dts/framework/remote_session/testpmd_shell.py @@ -806,6 +806,277 @@ def show_port_stats(self, port_id: int) -> TestPmdPortStats: return TestPmdPortStats.parse(output) + 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 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_strip_set_on(self, port: int, verify: bool = True): + """Enable vlan stripping on the specified port. + + Args: + port: The port number to use, should be within 0-32. + 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. + """ + vlan_strip_output = self.send_command(f"vlan set strip on {port}") + if verify: + if "strip on" not in self.send_command(f"show port info {port}"): + self._logger.debug(f"Failed to set vlan filter on for port {port}: \n{vlan_strip_output}") + raise InteractiveCommandExecutionError(f"Testpmd failed to set vlan filter on for port {port}.") + + def vlan_strip_set_off(self, port: int, verify: bool = True): + """Disable vlan stripping on the specified port. + + Args: + port: The port number to use, should be within 0-32. + verify: If :data:`True`, the output of the command and show port info + is scanned to verify that vlan stripping was disabled on the specified port. + If not, it is considered an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and stripping + fails to update. + """ + vlan_strip_output = self.send_command(f"vlan set strip off {port}") + if verify: + if "strip off" not in self.send_command(f"show port info {port}"): + self._logger.debug(f"Failed to disable vlan stripping on port {port}: \n{vlan_strip_output}") + raise InteractiveCommandExecutionError(f"Testpmd failed to disable vlan stripping on port {port}.") + + def port_stop_all(self, verify: bool = True): + """Stop all ports. + + Args: + port: Specifies the port number to use, must be between 0-32. + verify: If :data:`True`, the output of the command is scanned + to ensure all ports are stopped. If not, it is considered + an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and all ports + fail to stop.""" + port_output = self.send_command("port stop all") + if verify: + if "Done" not in port_output: + self._logger.debug(f"Failed to stop all ports: \n{port_output}") + raise InteractiveCommandExecutionError("Testpmd failed to stop all ports.") + + def port_stop(self, port: int, verify: bool = True): + """Stop specified port. + + Args: + port: Specifies the port number to use, must be between 0-32. + verify: If :data:`True`, the output of the command is scanned + to ensure specified port is stopped. If not, it is considered + an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the port + is not stopped.""" + port_output = self.send_command(f"port stop {port}") + if verify: + if "Done" not in port_output: + self._logger.debug(f"Failed to stop port {port}: \n{port_output}") + raise InteractiveCommandExecutionError(f"Testpmd failed to stop port {port}.") + + def port_start_all(self, verify: bool = True): + """Start all ports. + + Args: + port: Specifies the port number to use, must be between 0-32. + verify: If :data:`True`, the output of the command is scanned + to ensure all ports are started. If not, it is considered + an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and all ports + fail to start.""" + port_output = self.send_command("port start all") + if verify: + if "Done" not in port_output: + self._logger.debug(f"Failed to start all ports: \n{port_output}") + raise InteractiveCommandExecutionError("Testpmd failed to start all ports.") + + def port_start(self, port: int, verify: bool = True): + """Start specified port. + + Args: + port: Specifies the port number to use, must be between 0-32. + verify: If :data:`True`, the output of the command is scanned + to ensure specified port is started. If not, it is considered + an error. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the port + is not started.""" + port_output = self.send_command(f"port start {port}") + if verify: + if "Done" not in port_output: + self._logger.debug(f"Failed to start port {port}: \n{port_output}") + raise InteractiveCommandExecutionError(f"Testpmd failed to start port {port}.") + + + def tx_vlan_set(self, port: int, vlan: int, verify: bool = True): + """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 insertion 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): + """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 set {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): + """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): + """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.send_command("quit", "") -- 2.44.0