From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dts-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id AFA8C41B98;
Thu, 9 Feb 2023 07:56:39 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id A752242B8C;
Thu, 9 Feb 2023 07:56:39 +0100 (CET)
Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31])
by mails.dpdk.org (Postfix) with ESMTP id 621F44067B
for <dts@dpdk.org>; Thu, 9 Feb 2023 07:56:37 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1675925797; x=1707461797;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=WEqs752tUr04JFZ6IMA0ijBDcswJLletVuxwWEI2980=;
b=nSC57Xt6VSNG0OR6UTn9/kYkJmlmue6/XPmlgNXpz7dPPsK554D1Hr3Z
GjGcv26CHCJe31Cqlz1yPSzWSJt/ltjrAcGit7DKfcRUgIa+UL8+XsbRG
opIzYjegrMLyfhd3FdEvjdzBuSNrIO3HrYPutJVmeRe7iZK/Gd31KjcgT
1kbZCVfKvMWsAC3z1zz6Fz0EIDaiyNt2pRUd+IczFNRPQkcPgWSvGn4HH
wvKHnrSwzwsmehdI9Cf8KSlhhwSD3P58G6kPGQoZT0Porsb1ZnrjXFi4e
NgjriXMwxzc1PdRBA0yeVZ5/M4HPTPV1McmvoSsvOuLd5fLnMArzUZUcI w==;
X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="392420771"
X-IronPort-AV: E=Sophos;i="5.97,281,1669104000"; d="scan'208";a="392420771"
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
08 Feb 2023 22:56:36 -0800
X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="810224114"
X-IronPort-AV: E=Sophos;i="5.97,281,1669104000"; d="scan'208";a="810224114"
Received: from unknown (HELO localhost.localdomain) ([10.239.252.20])
by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
08 Feb 2023 22:56:35 -0800
From: Song Jiale <songx.jiale@intel.com>
To: dts@dpdk.org
Cc: Song Jiale <songx.jiale@intel.com>
Subject: [dts] [PATCH V1 3/4] tests/pmd_bonded: modify the script to adapt to
changes in dpdk
Date: Thu, 9 Feb 2023 14:53:50 +0000
Message-Id: <20230209145351.1140496-4-songx.jiale@intel.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20230209145351.1140496-1-songx.jiale@intel.com>
References: <20230209145351.1140496-1-songx.jiale@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dts@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: test suite reviews and discussions <dts.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dts>,
<mailto:dts-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dts/>
List-Post: <mailto:dts@dpdk.org>
List-Help: <mailto:dts-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dts>,
<mailto:dts-request@dpdk.org?subject=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 <songx.jiale@intel.com>
---
tests/TestSuite_pmd_bonded.py | 53 ++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 25 deletions(-)
diff --git a/tests/TestSuite_pmd_bonded.py b/tests/TestSuite_pmd_bonded.py
index 97f76e93..a27a991a 100644
--- a/tests/TestSuite_pmd_bonded.py
+++ b/tests/TestSuite_pmd_bonded.py
@@ -25,13 +25,13 @@ from framework.test_case import TestCase
SOCKET_0 = 0
SOCKET_1 = 1
-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)"
FRAME_SIZE_64 = 64
FRAME_SIZE_65 = 65
@@ -413,7 +413,7 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)'
"""
Get the mode of the bonding device which you choose.
"""
- return self.get_info_from_bond_config("Bonding mode: ", "\d*", bond_port)
+ return self.get_info_from_bond_config("Bonding mode: ", "\S*", bond_port)
def get_bond_balance_policy(self, bond_port):
"""
@@ -449,7 +449,7 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)'
"""
Get the primary slave of the bonding device which you choose.
"""
- return self.get_info_from_bond_config("Primary: \[", "\d*", bond_port)
+ return self.get_info_from_bond_config("Current Primary: \[", "\d*", bond_port)
def launch_app(self, pmd_param=" "):
"""
@@ -457,16 +457,18 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)'
"""
self.pmdout.start_testpmd("all", param=pmd_param)
- 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.
"""
+ p = r"\w+\((\d+)\)"
+ mode_id = int(re.match(p, mode).group(1))
out = self.dut.send_expect(
- "create bonded device %d %d" % (mode, socket), "testpmd> "
+ "create bonded device %d %d" % (mode_id, socket), "testpmd> "
)
self.verify(
"Created new bonded device" in out,
- "Create bonded device on mode [%d] socket [%d] failed" % (mode, socket),
+ "Create bonded device on mode [%s] socket [%d] failed" % (mode, socket),
)
bond_port = self.get_value_from_str(
"Created new bonded device net_bonding_testpmd_[\d] on \(port ", "\d+", out
@@ -478,7 +480,7 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)'
"show bonding config %d" % bond_port, "testpmd> "
)
self.verify(
- "Bonding mode: %d" % mode in out,
+ "Bonding mode: %s" % mode in out,
"Bonding mode display error when create bonded device",
)
self.verify(
@@ -911,19 +913,20 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)'
Do some basic operations to bonded devices and slaves,
such as adding, removing, setting primary or setting mode.
"""
+ p = r"\w+\((\d+)\)"
+ mode_id = int(re.match(p, mode_set).group(1))
bond_port_0 = self.create_bonded_device(mode_set, SOCKET_0, True)
self.add_slave_to_bonding_device(bond_port_0, False, self.dut_ports[1])
-
mode_value = self.get_bond_mode(bond_port_0)
- self.verify("%d" % mode_set in mode_value, "Setting bonding mode error")
+ self.verify("%s" % mode_set in mode_value, "Setting bonding mode error")
bond_port_1 = self.create_bonded_device(mode_set, SOCKET_0)
self.add_slave_to_bonding_device(bond_port_0, False, self.dut_ports[0])
self.add_slave_to_bonding_device(bond_port_1, True, self.dut_ports[0])
- OTHER_MODE = mode_set + 1 if not mode_set else mode_set - 1
+ OTHER_MODE = mode_id + 1 if not mode_id else mode_id - 1
self.set_mode_for_bonding_device(bond_port_0, OTHER_MODE)
- self.set_mode_for_bonding_device(bond_port_0, mode_set)
+ self.set_mode_for_bonding_device(bond_port_0, mode_id)
self.add_slave_to_bonding_device(bond_port_0, False, self.dut_ports[2])
time.sleep(5)
@@ -968,14 +971,14 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)'
self.verify(
mac_address_1_orig == mac_address_bond_now
and mac_address_bond_now == mac_address_2_now,
- "NOT all slaves MAC address same with bonding device in mode %d"
+ "NOT all slaves MAC address same with bonding device in mode %s"
% mode_set,
)
else:
self.verify(
mac_address_1_orig == mac_address_bond_now
and mac_address_bond_now != mac_address_2_now,
- "All slaves should not be the same in mode %d" % mode_set,
+ "All slaves should not be the same in mode %s" % mode_set,
)
new_mac = "00:11:22:00:33:44"
@@ -990,7 +993,7 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)'
== mac_address_2_now
== mac_address_bond_now
== new_mac,
- "Set mac failed for bonding device in mode %d" % mode_set,
+ "Set mac failed for bonding device in mode %s" % mode_set,
)
elif mode_set == MODE_LACP:
self.verify(
@@ -998,14 +1001,14 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)'
and mac_address_1_now != new_mac
and mac_address_2_now != new_mac
and mac_address_1_now != mac_address_2_now,
- "Set mac failed for bonding device in mode %d" % mode_set,
+ "Set mac failed for bonding device in mode %s" % mode_set,
)
elif mode_set in [MODE_ACTIVE_BACKUP, MODE_TLB_BALANCE]:
self.verify(
mac_address_bond_now == new_mac
and mac_address_1_now == new_mac
and mac_address_bond_now != mac_address_2_now,
- "Set mac failed for bonding device in mode %d" % mode_set,
+ "Set mac failed for bonding device in mode %s" % mode_set,
)
self.set_primary_for_bonding_device(bond_port, self.dut_ports[2], False)
@@ -1117,18 +1120,18 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)'
if mode_set in [MODE_ROUND_ROBIN, MODE_XOR_BALANCE, MODE_BROADCAST]:
self.verify(
port_disabled_num == 4,
- "Not all slaves of bonded device turn promiscuous mode off in mode %d."
+ "Not all slaves of bonded device turn promiscuous mode off in mode %s."
% mode_set,
)
elif mode_set == MODE_LACP:
self.verify(
port_disabled_num == 1,
- "Not only turn bound device promiscuous mode off in mode %d" % mode_set,
+ "Not only turn bound device promiscuous mode off in mode %s" % mode_set,
)
else:
self.verify(
port_disabled_num == 2,
- "Not only the primary slave turn promiscous mode off in mode %d, "
+ "Not only the primary slave turn promiscous mode off in mode %s, "
% mode_set
+ " when bonded device promiscous disabled.",
)
--
2.25.1