From patchwork Fri Feb 17 12:20:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jiale, SongX" X-Patchwork-Id: 124102 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B60FD41CB9; Fri, 17 Feb 2023 05:23:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD83640F18; Fri, 17 Feb 2023 05:23:17 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 5338440A8B for ; Fri, 17 Feb 2023 05:23:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676607795; x=1708143795; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=n6n9hRRm43CXH+bBGY6Mb6wDOmgSYS40tWLrS+Xu22c=; b=lq8CkOKWFc0cHDYwff0LiPDa4o6BDM9Gr8HEIogTMLsORo9IvAw5+l6T ldY8gT8UIZbeTYMpEO0jHFuV9+I6TsOWEYVO3Z9ZNQl1iZJRN3Wt3Y8at d6yi2NbDymi5YK0PPMSQltU5Mv0g0OCniN/lJXZi9YSg0JJIf6Mki32fN vTk2zfzvGMNwD9SybcqqLqP7VmKJJbbtd83yo2gidV6dx4IF4BpvPX3oA oFY3DjuvLbH+rkY27EKIT4RQF7QWyYOoyGseYxPyVwrEbMvAeqpluN7Ct jVL4MHRyIXsvexYd/rnkxOwQYqyKo8b/wpqX4+f/6UWEhC3OplsyqzP9q w==; X-IronPort-AV: E=McAfee;i="6500,9779,10623"; a="359353883" X-IronPort-AV: E=Sophos;i="5.97,304,1669104000"; d="scan'208";a="359353883" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Feb 2023 20:23:14 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10623"; a="663757836" X-IronPort-AV: E=Sophos;i="5.97,304,1669104000"; d="scan'208";a="663757836" Received: from unknown (HELO localhost.localdomain) ([10.239.252.20]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Feb 2023 20:23:13 -0800 From: Song Jiale To: dts@dpdk.org Cc: Song Jiale Subject: [dts] [PATCH V2 1/5] tests/bonding: modify script to adapt changes in dpdk Date: Fri, 17 Feb 2023 12:20:19 +0000 Message-Id: <20230217122023.2345221-2-songx.jiale@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230217122023.2345221-1-songx.jiale@intel.com> References: <20230217122023.2345221-1-songx.jiale@intel.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org the display information of the binding port in dpdk-testpmd has changed. modify the script to adapt to this change. According to dpdk commit f3b5f3d35c59e1("app/testpmd: use dump API to show bonding info"). Signed-off-by: Song Jiale --- tests/bonding.py | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/tests/bonding.py b/tests/bonding.py index 30f55c7f..c2c13b2a 100644 --- a/tests/bonding.py +++ b/tests/bonding.py @@ -19,13 +19,13 @@ from framework.pmd_output import PmdOutput from framework.settings import HEADER_SIZE # define bonding mode -MODE_ROUND_ROBIN = 0 -MODE_ACTIVE_BACKUP = 1 -MODE_XOR_BALANCE = 2 -MODE_BROADCAST = 3 -MODE_LACP = 4 -MODE_TLB_BALANCE = 5 -MODE_ALB_BALANCE = 6 +MODE_ROUND_ROBIN = "ROUND_ROBIN(0)" +MODE_ACTIVE_BACKUP = "ACTIVE_BACKUP(1)" +MODE_XOR_BALANCE = "BALANCE(2)" +MODE_BROADCAST = "BROADCAST(3)" +MODE_LACP = "8023AD(4)" +MODE_TLB_BALANCE = "TLB(5)" +MODE_ALB_BALANCE = "ALB(6)" # define packet size FRAME_SIZE_64 = 64 @@ -643,7 +643,7 @@ class PmdBonding(object): def get_bonding_info(self, bond_port, info_types): """Get the specified port information by its output message format""" info_set = { - "mode": ["Bonding mode: ", "\d*"], + "mode": ["Bonding mode: ", "\S*"], "agg_mode": ["IEEE802.3AD Aggregator Mode: ", "\S*"], "balance_policy": ["Balance Xmit Policy: ", "\S+"], "slaves": [ @@ -654,7 +654,7 @@ class PmdBonding(object): ["Active Slaves \(\d\): \[", "\d*( \d*)*"], ["Acitve Slaves: \[", "\d*( \d*)*"], ], - "primary": ["Primary: \[", "\d*"], + "current_primary": ["Current Primary: \[", "\d*"], } # get all config information config_content = self.d_console("show bonding config %d" % bond_port) @@ -684,18 +684,20 @@ class PmdBonding(object): return None def get_active_slaves(self, bond_port): - primary_port = int(self.get_bonding_info(bond_port, "primary")) + primary_port = int(self.get_bonding_info(bond_port, "current_primary")) active_slaves = self.get_bonding_info(bond_port, "active_slaves") return int(primary_port), [int(slave) for slave in active_slaves] - def create_bonded_device(self, mode=0, socket=0, verify_detail=False): + def create_bonded_device(self, mode="", socket=0, verify_detail=False): """ Create a bonding device with the parameters you specified. """ - cmd = "create bonded device %d %d" % (mode, socket) + p = r"\w+\((\d+)\)" + mode_id = int(re.match(p, mode).group(1)) + cmd = "create bonded device %d %d" % (mode_id, socket) out = self.d_console(cmd) - err_fmt = "Create bonded device on mode [%d] socket [%d] failed" + err_fmt = "Create bonded device on mode [%s] socket [%d] failed" self.verify("Created new bonded device" in out, err_fmt % (mode, socket)) fmts = [ "Created new bonded device net_bond_testpmd_[\d] on \(port ", @@ -708,7 +710,7 @@ class PmdBonding(object): if verify_detail: out = self.d_console("show bonding config %d" % bond_port) self.verify( - "Bonding mode: %d" % mode in out, + "Bonding mode: %s" % mode in out, "Bonding mode display error when create bonded device", ) self.verify( @@ -719,8 +721,8 @@ class PmdBonding(object): "Active Slaves display error when create bonded device", ) self.verify( - "Primary: []" not in out, - "Primary display error when create bonded device", + "Current Primary: []" not in out, + "Current Primary display error when create bonded device", ) out = self.d_console("show port info %d" % bond_port) self.verify( @@ -796,7 +798,7 @@ class PmdBonding(object): """ cmd = "set bonding primary %d %d" % (slave_port, bond_port) self.d_console(cmd) - out = self.get_bonding_info(bond_port, "primary") + out = self.get_bonding_info(bond_port, "current_primary") if not invert_verify: self.verify(str(slave_port) in out, "Set bonding primary port failed") else: