[V1] tests/TestSuite_shutdown_api:fixed differences brought about by speed units
diff mbox series

Message ID 20200928071329.8897-1-linglix.chen@intel.com
State Changes Requested
Headers show
Series
  • [V1] tests/TestSuite_shutdown_api:fixed differences brought about by speed units
Related show

Commit Message

Chen Linglix Sept. 28, 2020, 7:13 a.m. UTC
From: chenlinglix <linglix.chen@intel.com>

fixed differences brought about by speed units

Signed-off-by: chenlinglix <linglix.chen@intel.com>
---
 tests/TestSuite_shutdown_api.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

Comments

Chen Linglix Sept. 28, 2020, 7:21 a.m. UTC | #1
Tested-by:  Chen, LingliX <linglix.chen@intel.com>

Regards,
Chen, LingliX

> -----Original Message-----
> From: Chen, LingliX
> Sent: Monday, September 28, 2020 3:13 PM
> To: dts@dpdk.org
> Cc: Chen, LingliX <linglix.chen@intel.com>
> Subject: [dts][PATCH V1] tests/TestSuite_shutdown_api:fixed differences
> brought about by speed units
LihongX Ma Oct. 12, 2020, 6:39 a.m. UTC | #2
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Chen Linglix
> Sent: Monday, September 28, 2020 3:13 PM
> To: dts@dpdk.org
> Cc: Chen, LingliX <linglix.chen@intel.com>
> Subject: [dts] [PATCH V1] tests/TestSuite_shutdown_api:fixed differences
> brought about by speed units
> 
> From: chenlinglix <linglix.chen@intel.com>
> 
> fixed differences brought about by speed units
> 
> Signed-off-by: chenlinglix <linglix.chen@intel.com>
> -                self.verify("Link speed: %s Mbps" % config[0] in out,
> -                            "Wrong speed reported by the dut")
> +                if config[0] in['1000', '10000']:
> +                    num =int(int(config[0])/1000)
> +                    self.verify("Link speed: %d Gbps" % num in out,
> +                                "Wrong speed reported by the dut")
> +                else:
> +                    self.verify("Link speed: %s Mbps" % config[0] in out,
> +                                "Wrong speed reported by the dut")

Hi, lingli
Can you write clearly why do we need to do this change ? 


Regards,
Ma,lihong
Chen Linglix Oct. 12, 2020, 6:54 a.m. UTC | #3
if change Link speed is1000 or 10000,the DUT's Link speed is 1 Gbps or 10 Gbps,
if change Link speed is100, the DUT's Link speed is 100 Mbps

> -----Original Message-----
> From: Ma, LihongX
> Sent: Monday, October 12, 2020 2:39 PM
> To: Chen, LingliX <linglix.chen@intel.com>; dts@dpdk.org
> Cc: Chen, LingliX <linglix.chen@intel.com>
> Subject: RE: [dts] [PATCH V1] tests/TestSuite_shutdown_api:fixed
> differences brought about by speed units
> 
> 
> 
> > -----Original Message-----
> > From: dts <dts-bounces@dpdk.org> On Behalf Of Chen Linglix
> > Sent: Monday, September 28, 2020 3:13 PM
> > To: dts@dpdk.org
> > Cc: Chen, LingliX <linglix.chen@intel.com>
> > Subject: [dts] [PATCH V1] tests/TestSuite_shutdown_api:fixed
> > differences brought about by speed units
> >
> > From: chenlinglix <linglix.chen@intel.com>
> >
> > fixed differences brought about by speed units
> >
> > Signed-off-by: chenlinglix <linglix.chen@intel.com>
> > -                self.verify("Link speed: %s Mbps" % config[0] in out,
> > -                            "Wrong speed reported by the dut")
> > +                if config[0] in['1000', '10000']:
> > +                    num =int(int(config[0])/1000)
> > +                    self.verify("Link speed: %d Gbps" % num in out,
> > +                                "Wrong speed reported by the dut")
> > +                else:
> > +                    self.verify("Link speed: %s Mbps" % config[0] in out,
> > +                                "Wrong speed reported by the dut")
> 
> Hi, lingli
> Can you write clearly why do we need to do this change ?
> 
> 
> Regards,
> Ma,lihong
Tu, Lijuan Oct. 13, 2020, 2:13 a.m. UTC | #4
> > Can you write clearly why do we need to do this change ?
> 
> if change Link speed is1000 or 10000,the DUT's Link speed is 1 Gbps or 10 Gbps,
> if change Link speed is100, the DUT's Link speed is 100 Mbps

It's not a good idea to get unit by value, if the speed is 1000Gbps(although we don't have it now, but soon in future), it can't know it is Gbps or Mbps.
Generally speaking, get unit first and then verify value.

Patch
diff mbox series

diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py
index edd1dcf..5255639 100644
--- a/tests/TestSuite_shutdown_api.py
+++ b/tests/TestSuite_shutdown_api.py
@@ -515,8 +515,13 @@  class TestShutdownApi(TestCase):
                 out = self.dut.send_expect("show port info %s" % port, "testpmd>")
                 self.verify("Link status: up" in out,
                             "Wrong link status reported by the dut")
-                self.verify("Link speed: %s Mbps" % config[0] in out,
-                            "Wrong speed reported by the dut")
+                if config[0] in['1000', '10000']:
+                    num =int(int(config[0])/1000)
+                    self.verify("Link speed: %d Gbps" % num in out,
+                                "Wrong speed reported by the dut")
+                else:
+                    self.verify("Link speed: %s Mbps" % config[0] in out,
+                                "Wrong speed reported by the dut")
                 self.verify("Link duplex: %s-duplex" % config[1].lower() in out,
                             "Wrong link type reported by the dut")
                 out = self.tester.send_expect(
@@ -547,7 +552,7 @@  class TestShutdownApi(TestCase):
         if not self.check_linkspeed_config(configs):
             return
 
-        result_linkspeed_scanner = r"Link\s*speed:\s([0-9]+)\s*Mbps"
+        result_linkspeed_scanner = r"Link\s*speed:\s([0-9]+)\s*(\S+)"
         linkspeed_scanner = re.compile(result_linkspeed_scanner, re.DOTALL)
         result_linktype_scanner = r"Link\s*duplex:\s*(\S*)\s*-\s*duplex"
         linktype_scanner = re.compile(result_linktype_scanner, re.DOTALL)
@@ -576,11 +581,12 @@  class TestShutdownApi(TestCase):
                 time.sleep(1)
 
             out = self.vm0_testpmd.execute_cmd('show port info all')
-
-            linkspeed = linkspeed_scanner.findall(out)
+            linkspeed = linkspeed_scanner.findall(out)[0]
             linktype = linktype_scanner.findall(out)
-
-            self.verify(config[0] in linkspeed,
+            actual_speed = int(linkspeed[0])
+            if linkspeed[1] == "Gbps":
+                actual_speed = actual_speed * 1000
+            self.verify(config[0] == str(actual_speed),
                         "Wrong VF speed reported by the self.tester.")
             self.verify(config[1].lower() == linktype[0].lower(),
                         "Wrong VF link type reported by the self.tester.")