diff mbox series

[V1,4/4] tests/bonding: modify the script to adapt to changes in dpdk

Message ID 20230209145351.1140496-5-songx.jiale@intel.com (mailing list archive)
State Superseded
Headers
Series modify the script to adapt to changes in dpdk |

Checks

Context Check Description
ci/Intel-dts-format-test success Testing OK
ci/Intel-dts-pylama-test success Testing OK
ci/Intel-dts-doc-test success Testing OK
ci/Intel-dts-suite-test success Testing OK

Commit Message

Jiale, SongX Feb. 9, 2023, 2:53 p.m. UTC 
  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/bonding.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/tests/bonding.py b/tests/bonding.py
index 30f55c7f..d6d3ea30 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": [
@@ -689,13 +689,15 @@  class PmdBonding(object):
 
         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(