[dts] [PATCH] change the verification of pktbytes in pmd cases

[dts] [PATCH] change the verification of pktbytes in pmd cases

[yongjie]

From: Gu yongjie <yongjiex.gu@intel.com>

Change the verification of pktbytes,because DPDK removes the crc bytes from byte counter.

Signed-off-by: Gu yongjie <yongjiex.gu@intel.com>
---
 tests/TestSuite_pmd.py |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py
index 29dec2b..bfd5e03 100644
--- a/tests/TestSuite_pmd.py
+++ b/tests/TestSuite_pmd.py
@@ -299,7 +299,7 @@ class TestPmd(TestCase,IxiaPacketGenerator):
 
         for rxfreet_value in self.rxfreet_values:
 
-            self.pmdout.start_testpmd("all", "--coremask=%s --portmask=%s --nb-cores=2 --enable-rx-cksum --disable-hw-vlan --disable-rss --crc-strip --rxd=1024 --txd=1024 --rxfreet=%d" % (core_mask, port_mask, rxfreet_value))
+            self.pmdout.start_testpmd("all", "--coremask=%s --portmask=%s --nb-cores=2 --enable-rx-cksum --disable-hw-vlan --disable-rss --rxd=1024 --txd=1024 --rxfreet=%d" % (core_mask, port_mask, rxfreet_value))
             self.dut.send_expect("set fwd csum", "testpmd> ")
             self.dut.send_expect("start", "testpmd> ")
 
@@ -402,19 +402,11 @@ class TestPmd(TestCase,IxiaPacketGenerator):
         self.verify(p0tx_pkts == p1rx_pkts,
                     "packet pass assert error, %d RX packets, %d TX packets" % (p1rx_pkts, p0tx_pkts))
 
-        if checksum_test:
-            if self.nic in ["powerville", "springville", "kawela_4"]:
-            	self.verify(p1rx_bytes == frame_size,
-                        	"packet pass assert error, expected %d RX bytes, actual %d" % (frame_size, p1rx_bytes))
-            else:
-            	self.verify(p1rx_bytes == frame_size - 4,
-                        	"packet pass assert error, expected %d RX bytes, actual %d" % (frame_size - 4, p1rx_bytes))
-        else:
-            self.verify(p1rx_bytes == frame_size,
-                        "packet pass assert error, expected %d RX bytes, actual %d" % (frame_size, p1rx_bytes))
-
-        self.verify(p0tx_bytes == frame_size,
-                    "packet pass assert error, expected %d TX bytes, actual %d" % (frame_size, p0tx_bytes))
+        self.verify(p1rx_bytes == frame_size - 4,
+                    "packet pass assert error, expected %d RX bytes, actual %d" % (frame_size - 4, p1rx_bytes))
+
+        self.verify(p0tx_bytes == frame_size - 4,
+                    "packet pass assert error, expected %d TX bytes, actual %d" % (frame_size - 4, p0tx_bytes))
 
         return out
     
-- 
1.7.4.4

[dts] [PATCH] change the verification of pktbytes in jumboframes cases

[yongjie]

From: Gu yongjie <yongjiex.gu@intel.com>

Change the verification of pktbytes,because DPDK removes the crc bytes from byte counter.

Signed-off-by: Gu yongjie <yongjiex.gu@intel.com>
---
 tests/TestSuite_jumboframes.py |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/TestSuite_jumboframes.py b/tests/TestSuite_jumboframes.py
index a295624..1cceba8 100644
--- a/tests/TestSuite_jumboframes.py
+++ b/tests/TestSuite_jumboframes.py
@@ -93,12 +93,8 @@ class TestJumboframes(TestCase):
         p1rx_err -= gp1rx_err
 
         if received:
-            if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]:
-                self.verify((p0tx_pkts == p1rx_pkts) and ((p0tx_bytes + 4) == pktsize) and (p1rx_bytes == pktsize),
-                            "packet pass assert error")
-            else:
-                self.verify((p0tx_pkts == p1rx_pkts) and (p0tx_bytes == pktsize) and (p1rx_bytes == pktsize),
-                            "packet pass assert error")
+            self.verify((p0tx_pkts == p1rx_pkts) and ((p0tx_bytes + 4) == pktsize) and ((p1rx_bytes + 4) == pktsize),
+                        "packet pass assert error")
         else:
             #self.verify(p0tx_pkts == p1rx_pkts and (p1rx_err == 1 or p1rx_pkts == 0),
             self.verify(p1rx_err == 1 or p0tx_pkts == 0, "packet drop assert error")
-- 
1.7.4.4

Re: [dts] [PATCH] change the verification of pktbytes in pmd cases

[Liu, Yong]

Thanks, applied.

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of yongjie
> Sent: Friday, November 27, 2015 3:10 PM
> To: dts@dpdk.org
> Cc: Gu, YongjieX
> Subject: [dts] [PATCH] change the verification of pktbytes in pmd cases
> 
> From: Gu yongjie <yongjiex.gu@intel.com>
> 
> Change the verification of pktbytes,because DPDK removes the crc bytes
> from byte counter.
> 
> Signed-off-by: Gu yongjie <yongjiex.gu@intel.com>
> ---
>  tests/TestSuite_pmd.py |   20 ++++++--------------
>  1 files changed, 6 insertions(+), 14 deletions(-)
> 
> diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py
> index 29dec2b..bfd5e03 100644
> --- a/tests/TestSuite_pmd.py
> +++ b/tests/TestSuite_pmd.py
> @@ -299,7 +299,7 @@ class TestPmd(TestCase,IxiaPacketGenerator):
> 
>          for rxfreet_value in self.rxfreet_values:
> 
> -            self.pmdout.start_testpmd("all", "--coremask=%s --portmask=%s
> --nb-cores=2 --enable-rx-cksum --disable-hw-vlan --disable-rss --crc-strip
> --rxd=1024 --txd=1024 --rxfreet=%d" % (core_mask, port_mask,
> rxfreet_value))
> +            self.pmdout.start_testpmd("all", "--coremask=%s --portmask=%s
> --nb-cores=2 --enable-rx-cksum --disable-hw-vlan --disable-rss --rxd=1024
> --txd=1024 --rxfreet=%d" % (core_mask, port_mask, rxfreet_value))
>              self.dut.send_expect("set fwd csum", "testpmd> ")
>              self.dut.send_expect("start", "testpmd> ")
> 
> @@ -402,19 +402,11 @@ class TestPmd(TestCase,IxiaPacketGenerator):
>          self.verify(p0tx_pkts == p1rx_pkts,
>                      "packet pass assert error, %d RX packets, %d TX
> packets" % (p1rx_pkts, p0tx_pkts))
> 
> -        if checksum_test:
> -            if self.nic in ["powerville", "springville", "kawela_4"]:
> -            	self.verify(p1rx_bytes == frame_size,
> -                        	"packet pass assert error, expected %d RX
> bytes, actual %d" % (frame_size, p1rx_bytes))
> -            else:
> -            	self.verify(p1rx_bytes == frame_size - 4,
> -                        	"packet pass assert error, expected %d RX
> bytes, actual %d" % (frame_size - 4, p1rx_bytes))
> -        else:
> -            self.verify(p1rx_bytes == frame_size,
> -                        "packet pass assert error, expected %d RX bytes,
> actual %d" % (frame_size, p1rx_bytes))
> -
> -        self.verify(p0tx_bytes == frame_size,
> -                    "packet pass assert error, expected %d TX bytes,
> actual %d" % (frame_size, p0tx_bytes))
> +        self.verify(p1rx_bytes == frame_size - 4,
> +                    "packet pass assert error, expected %d RX bytes,
> actual %d" % (frame_size - 4, p1rx_bytes))
> +
> +        self.verify(p0tx_bytes == frame_size - 4,
> +                    "packet pass assert error, expected %d TX bytes,
> actual %d" % (frame_size - 4, p0tx_bytes))
> 
>          return out
> 
> --
> 1.7.4.4

Re: [dts] [PATCH] change the verification of pktbytes in jumboframes cases

[Liu, Yong]

Thanks, applied.

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of yongjie
> Sent: Friday, November 27, 2015 3:10 PM
> To: dts@dpdk.org
> Cc: Gu, YongjieX
> Subject: [dts] [PATCH] change the verification of pktbytes in jumboframes
> cases
> 
> From: Gu yongjie <yongjiex.gu@intel.com>
> 
> Change the verification of pktbytes,because DPDK removes the crc bytes
> from byte counter.
> 
> Signed-off-by: Gu yongjie <yongjiex.gu@intel.com>
> ---
>  tests/TestSuite_jumboframes.py |    8 ++------
>  1 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/TestSuite_jumboframes.py
> b/tests/TestSuite_jumboframes.py
> index a295624..1cceba8 100644
> --- a/tests/TestSuite_jumboframes.py
> +++ b/tests/TestSuite_jumboframes.py
> @@ -93,12 +93,8 @@ class TestJumboframes(TestCase):
>          p1rx_err -= gp1rx_err
> 
>          if received:
> -            if self.nic in ["fortville_eagle", "fortville_spirit",
> "fortville_spirit_single"]:
> -                self.verify((p0tx_pkts == p1rx_pkts) and ((p0tx_bytes + 4)
> == pktsize) and (p1rx_bytes == pktsize),
> -                            "packet pass assert error")
> -            else:
> -                self.verify((p0tx_pkts == p1rx_pkts) and (p0tx_bytes ==
> pktsize) and (p1rx_bytes == pktsize),
> -                            "packet pass assert error")
> +            self.verify((p0tx_pkts == p1rx_pkts) and ((p0tx_bytes + 4) ==
> pktsize) and ((p1rx_bytes + 4) == pktsize),
> +                        "packet pass assert error")
>          else:
>              #self.verify(p0tx_pkts == p1rx_pkts and (p1rx_err == 1 or
> p1rx_pkts == 0),
>              self.verify(p1rx_err == 1 or p0tx_pkts == 0, "packet drop
> assert error")
> --
> 1.7.4.4