[dts] [PATCH V3] tests/shutdown_api: check crc strip bit instead of Rx offloads to verify CRC is enabled or not

[dts] [PATCH V3] tests/shutdown_api: check crc strip bit instead of Rx offloads to verify CRC is enabled or not

[wenjieli]

If crc strip is enabled, the crc strip bit (bit 16) is 0, else it is 1. 
Use this bit to check crc is enabled or not, will not just check the 
Rx offloads value in output.

Signed-off-by: wenjieli <wenjiex.a.li@intel.com>
---
 tests/TestSuite_shutdown_api.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py
index 52a8fbf..1282cf7 100644
--- a/tests/TestSuite_shutdown_api.py
+++ b/tests/TestSuite_shutdown_api.py
@@ -263,18 +263,24 @@ class TestShutdownApi(TestCase):
         """
         Reconfigure All Ports With The Same Configurations (CRC)
         """
+        RX_OFFLOAD_KEEP_CRC = 0x10000
+
         self.pmdout.start_testpmd("Default", "--portmask=%s --port-topology=loop --disable-crc-strip" % utils.create_mask(self.ports), socket=self.ports_socket)
         out = self.dut.send_expect("show config rxtx", "testpmd> ")
+        Rx_offloads = re.compile('Rx offloads=(.*?)\s+?').findall(out, re.S)
+        crc_keep = int(Rx_offloads[0],16) & RX_OFFLOAD_KEEP_CRC and int(Rx_offloads[1],16) & RX_OFFLOAD_KEEP_CRC
         self.verify(
-            "Rx offloads=0x10000" in out, "CRC keeping not enabled properly")
+            crc_keep == RX_OFFLOAD_KEEP_CRC, "CRC keeping not enabled properly")
 
         self.dut.send_expect("port stop all", "testpmd> ", 100)
         self.dut.send_expect("port config all crc-strip on", "testpmd> ")
         self.dut.send_expect("set fwd mac", "testpmd>")
         self.dut.send_expect("port start all", "testpmd> ", 100)
         out = self.dut.send_expect("show config rxtx", "testpmd> ")
+        Rx_offloads = re.compile('Rx offloads=(.*?)\s+?').findall(out, re.S)
+        crc_strip = int(Rx_offloads[0],16) | ~RX_OFFLOAD_KEEP_CRC and int(Rx_offloads[1],16) | ~RX_OFFLOAD_KEEP_CRC
         self.verify(
-            "Rx offloads=0x1000" in out, "CRC stripping not enabled properly")
+            crc_strip == ~RX_OFFLOAD_KEEP_CRC, "CRC stripping not enabled properly")
         self.dut.send_expect("start", "testpmd> ")
         self.check_forwarding()
 
-- 
2.17.2

Re: [dts] [PATCH V3] tests/shutdown_api: check crc strip bit instead of Rx offloads to verify CRC is enabled or not

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of wenjieli
> Sent: Wednesday, October 24, 2018 5:12 PM
> To: dts@dpdk.org
> Cc: Li, WenjieX A <wenjiex.a.li@intel.com>
> Subject: [dts] [PATCH V3] tests/shutdown_api: check crc strip bit instead of
> Rx offloads to verify CRC is enabled or not
> 
> If crc strip is enabled, the crc strip bit (bit 16) is 0, else it is 1.
> Use this bit to check crc is enabled or not, will not just check the Rx offloads
> value in output.
> 
> Signed-off-by: wenjieli <wenjiex.a.li@intel.com>
> ---
>  tests/TestSuite_shutdown_api.py | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/TestSuite_shutdown_api.py
> b/tests/TestSuite_shutdown_api.py index 52a8fbf..1282cf7 100644
> --- a/tests/TestSuite_shutdown_api.py
> +++ b/tests/TestSuite_shutdown_api.py
> @@ -263,18 +263,24 @@ class TestShutdownApi(TestCase):
>          """
>          Reconfigure All Ports With The Same Configurations (CRC)
>          """
> +        RX_OFFLOAD_KEEP_CRC = 0x10000
> +
>          self.pmdout.start_testpmd("Default", "--portmask=%s
> --port-topology=loop --disable-crc-strip" % utils.create_mask(self.ports),
> socket=self.ports_socket)
>          out = self.dut.send_expect("show config rxtx", "testpmd> ")
> +        Rx_offloads = re.compile('Rx offloads=(.*?)\s+?').findall(out, re.S)
> +        crc_keep = int(Rx_offloads[0],16) & RX_OFFLOAD_KEEP_CRC and
> + int(Rx_offloads[1],16) & RX_OFFLOAD_KEEP_CRC
>          self.verify(
> -            "Rx offloads=0x10000" in out, "CRC keeping not enabled
> properly")
> +            crc_keep == RX_OFFLOAD_KEEP_CRC, "CRC keeping not
> enabled
> + properly")
> 
>          self.dut.send_expect("port stop all", "testpmd> ", 100)
>          self.dut.send_expect("port config all crc-strip on", "testpmd> ")
>          self.dut.send_expect("set fwd mac", "testpmd>")
>          self.dut.send_expect("port start all", "testpmd> ", 100)
>          out = self.dut.send_expect("show config rxtx", "testpmd> ")
> +        Rx_offloads = re.compile('Rx offloads=(.*?)\s+?').findall(out, re.S)
> +        crc_strip = int(Rx_offloads[0],16) | ~RX_OFFLOAD_KEEP_CRC and
> + int(Rx_offloads[1],16) | ~RX_OFFLOAD_KEEP_CRC
>          self.verify(
> -            "Rx offloads=0x1000" in out, "CRC stripping not enabled
> properly")
> +            crc_strip == ~RX_OFFLOAD_KEEP_CRC, "CRC stripping not
> + enabled properly")
>          self.dut.send_expect("start", "testpmd> ")
>          self.check_forwarding()
> 
> --
> 2.17.2