[dts] [PATCH V1]tests/mac_filter: fix FVL stats issue

[dts] [PATCH V1]tests/mac_filter: fix FVL stats issue

[han,yingya]

In testpmd show port stats command is to read FVL register, and it's all packets of FVL.
Contrast to FLV , Niantic's stats, tx/rx packets , don't include packets filtered.
It's a difference between Niantic and FLV.
Signed-off-by: han,yingya <yingyax.han@intel.com>
---
 tests/TestSuite_mac_filter.py | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/tests/TestSuite_mac_filter.py b/tests/TestSuite_mac_filter.py
index 1c58b87..a0c890d 100644
--- a/tests/TestSuite_mac_filter.py
+++ b/tests/TestSuite_mac_filter.py
@@ -107,48 +107,45 @@ class TestWhitelist(TestCase):
 
         # send one packet with the portid MAC address
         self.whitelist_send_packet(portid, self.dest)
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
+        out = self.dut.get_session_output()
+        cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")
         # check the packet increase
         self.verify(int(cur_rxpkt) == int(pre_rxpkt) + self.frames_to_send,
                     "Packet has not been received on default address")
         # send one packet to a different MAC address
         # new_mac = self.dut.get_mac_address(portid)
         self.whitelist_send_packet(portid, fake_mac_addr)
-
+        out = self.dut.get_session_output()
         pre_rxpkt = cur_rxpkt
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
-
-        # check the packet DO NOT increase
-        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
+        if not out:
+            cur_rxpkt = 0
+            # check the packet DO NOT increase
+            self.verify(int(cur_rxpkt) == int(pre_rxpkt) - self.frames_to_send,
                     "Packet has been received on a new MAC address that has not been added yet")
         # add the different MAC address
-        out = self.dut.send_expect("mac_addr add %d" % portid + " %s" % fake_mac_addr, "testpmd>")
+        self.dut.send_expect("mac_addr add %d" % portid + " %s" % fake_mac_addr, "testpmd>")
 
         # send again one packet to a different MAC address
         self.whitelist_send_packet(portid, fake_mac_addr)
-
+        out = self.dut.get_session_output()
         pre_rxpkt = cur_rxpkt
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
+        cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")
 
         # check the packet increase
         self.verify(int(cur_rxpkt) == int(pre_rxpkt) + self.frames_to_send,
                     "Packet has not been received on a new MAC address that has been added to the port")
 
         # remove the fake MAC address
-        out = self.dut.send_expect("mac_addr remove %d" % portid + " %s" % fake_mac_addr, "testpmd>")
+        self.dut.send_expect("mac_addr remove %d" % portid + " %s" % fake_mac_addr, "testpmd>")
 
         # send again one packet to a different MAC address
         self.whitelist_send_packet(portid, fake_mac_addr)
-
+        out = self.dut.get_session_output()
         pre_rxpkt = cur_rxpkt
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
-
-        # check the packet increase
-        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
+        if not out:
+            cur_rxpkt = 0
+            # check the packet increase
+            self.verify(int(cur_rxpkt) == int(pre_rxpkt) - self.frames_to_send,
                     "Packet has been received on a new MAC address that has been removed from the port")
         self.dut.send_expect("stop", "testpmd> ")
 
-- 
1.9.3

Re: [dts] [PATCH V1]tests/mac_filter: fix FVL stats issue

[Liu, Yong]

Yingya,
Some comments are inline.

Thanks,
Marvin

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of han,yingya
> Sent: Tuesday, March 20, 2018 12:41 PM
> To: dts@dpdk.org
> Cc: Han, YingyaX <yingyax.han@intel.com>
> Subject: [dts] [PATCH V1]tests/mac_filter: fix FVL stats issue
> 
> In testpmd show port stats command is to read FVL register, and it's all
> packets of FVL.
> Contrast to FLV , Niantic's stats, tx/rx packets , don't include packets
> filtered.
> It's a difference between Niantic and FLV.
> Signed-off-by: han,yingya <yingyax.han@intel.com>
> ---
>  tests/TestSuite_mac_filter.py | 35 ++++++++++++++++-------------------
>  1 file changed, 16 insertions(+), 19 deletions(-)
> 
> diff --git a/tests/TestSuite_mac_filter.py b/tests/TestSuite_mac_filter.py
> index 1c58b87..a0c890d 100644
> --- a/tests/TestSuite_mac_filter.py
> +++ b/tests/TestSuite_mac_filter.py
> @@ -107,48 +107,45 @@ class TestWhitelist(TestCase):
> 
>          # send one packet with the portid MAC address
>          self.whitelist_send_packet(portid, self.dest)
> -        out = self.dut.send_expect("show port stats %d" % portid,
> "testpmd> ")
> -        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
> +        out = self.dut.get_session_output()
> +        cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")

Checking packet number by Rx only verbose output is one alternative way to get receive number of packets.
You'd better add some comments about why here not use "port stats".

>          # check the packet increase
>          self.verify(int(cur_rxpkt) == int(pre_rxpkt) +
> self.frames_to_send,
>                      "Packet has not been received on default address")
>          # send one packet to a different MAC address
>          # new_mac = self.dut.get_mac_address(portid)
>          self.whitelist_send_packet(portid, fake_mac_addr)
> -
> +        out = self.dut.get_session_output()
>          pre_rxpkt = cur_rxpkt
> -        out = self.dut.send_expect("show port stats %d" % portid,
> "testpmd> ")
> -        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
> -
> -        # check the packet DO NOT increase
> -        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
> +        if not out:
> +            cur_rxpkt = 0
> +            # check the packet DO NOT increase
> +            self.verify(int(cur_rxpkt) == int(pre_rxpkt) -
> self.frames_to_send,
>                      "Packet has been received on a new MAC address that
> has not been added yet")


I think here just need to check no packet is arrived. Only need to check no "received" message in output is enough. 

>          # add the different MAC address
> -        out = self.dut.send_expect("mac_addr add %d" % portid + " %s" %
> fake_mac_addr, "testpmd>")
> +        self.dut.send_expect("mac_addr add %d" % portid + " %s" %
> fake_mac_addr, "testpmd>")
> 
>          # send again one packet to a different MAC address
>          self.whitelist_send_packet(portid, fake_mac_addr)
> -
> +        out = self.dut.get_session_output()
>          pre_rxpkt = cur_rxpkt
> -        out = self.dut.send_expect("show port stats %d" % portid,
> "testpmd> ")
> -        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
> +        cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")
> 
>          # check the packet increase
>          self.verify(int(cur_rxpkt) == int(pre_rxpkt) +
> self.frames_to_send,
>                      "Packet has not been received on a new MAC address
> that has been added to the port")
> 
>          # remove the fake MAC address
> -        out = self.dut.send_expect("mac_addr remove %d" % portid + " %s" %
> fake_mac_addr, "testpmd>")
> +        self.dut.send_expect("mac_addr remove %d" % portid + " %s" %
> fake_mac_addr, "testpmd>")
> 
>          # send again one packet to a different MAC address
>          self.whitelist_send_packet(portid, fake_mac_addr)
> -
> +        out = self.dut.get_session_output()
>          pre_rxpkt = cur_rxpkt
> -        out = self.dut.send_expect("show port stats %d" % portid,
> "testpmd> ")
> -        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
> -
> -        # check the packet increase
> -        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
> +        if not out:
> +            cur_rxpkt = 0
> +            # check the packet increase
> +            self.verify(int(cur_rxpkt) == int(pre_rxpkt) -
> self.frames_to_send,

Same comment as previous one.

>                      "Packet has been received on a new MAC address that
> has been removed from the port")
>          self.dut.send_expect("stop", "testpmd> ")
> 
> --
> 1.9.3

Re: [dts] [PATCH V1]tests/mac_filter: fix FVL stats issue

[Han, YingyaX]

Thank you for your suggestion. I have revised it and submitted the patch.

Thanks ,
yingya

-----Original Message-----
From: Liu, Yong 
Sent: Tuesday, March 27, 2018 4:56 PM
To: Han, YingyaX <yingyax.han@intel.com>; dts@dpdk.org
Cc: Han, YingyaX <yingyax.han@intel.com>
Subject: RE: [dts] [PATCH V1]tests/mac_filter: fix FVL stats issue

Yingya,
Some comments are inline.

Thanks,
Marvin

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of han,yingya
> Sent: Tuesday, March 20, 2018 12:41 PM
> To: dts@dpdk.org
> Cc: Han, YingyaX <yingyax.han@intel.com>
> Subject: [dts] [PATCH V1]tests/mac_filter: fix FVL stats issue
> 
> In testpmd show port stats command is to read FVL register, and it's 
> all packets of FVL.
> Contrast to FLV , Niantic's stats, tx/rx packets , don't include 
> packets filtered.
> It's a difference between Niantic and FLV.
> Signed-off-by: han,yingya <yingyax.han@intel.com>
> ---
>  tests/TestSuite_mac_filter.py | 35 
> ++++++++++++++++-------------------
>  1 file changed, 16 insertions(+), 19 deletions(-)
> 
> diff --git a/tests/TestSuite_mac_filter.py 
> b/tests/TestSuite_mac_filter.py index 1c58b87..a0c890d 100644
> --- a/tests/TestSuite_mac_filter.py
> +++ b/tests/TestSuite_mac_filter.py
> @@ -107,48 +107,45 @@ class TestWhitelist(TestCase):
> 
>          # send one packet with the portid MAC address
>          self.whitelist_send_packet(portid, self.dest)
> -        out = self.dut.send_expect("show port stats %d" % portid,
> "testpmd> ")
> -        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
> +        out = self.dut.get_session_output()
> +        cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")

Checking packet number by Rx only verbose output is one alternative way to get receive number of packets.
You'd better add some comments about why here not use "port stats".

>          # check the packet increase
>          self.verify(int(cur_rxpkt) == int(pre_rxpkt) + 
> self.frames_to_send,
>                      "Packet has not been received on default address")
>          # send one packet to a different MAC address
>          # new_mac = self.dut.get_mac_address(portid)
>          self.whitelist_send_packet(portid, fake_mac_addr)
> -
> +        out = self.dut.get_session_output()
>          pre_rxpkt = cur_rxpkt
> -        out = self.dut.send_expect("show port stats %d" % portid,
> "testpmd> ")
> -        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
> -
> -        # check the packet DO NOT increase
> -        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
> +        if not out:
> +            cur_rxpkt = 0
> +            # check the packet DO NOT increase
> +            self.verify(int(cur_rxpkt) == int(pre_rxpkt) -
> self.frames_to_send,
>                      "Packet has been received on a new MAC address 
> that has not been added yet")


I think here just need to check no packet is arrived. Only need to check no "received" message in output is enough. 

>          # add the different MAC address
> -        out = self.dut.send_expect("mac_addr add %d" % portid + " %s" %
> fake_mac_addr, "testpmd>")
> +        self.dut.send_expect("mac_addr add %d" % portid + " %s" %
> fake_mac_addr, "testpmd>")
> 
>          # send again one packet to a different MAC address
>          self.whitelist_send_packet(portid, fake_mac_addr)
> -
> +        out = self.dut.get_session_output()
>          pre_rxpkt = cur_rxpkt
> -        out = self.dut.send_expect("show port stats %d" % portid,
> "testpmd> ")
> -        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
> +        cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")
> 
>          # check the packet increase
>          self.verify(int(cur_rxpkt) == int(pre_rxpkt) + 
> self.frames_to_send,
>                      "Packet has not been received on a new MAC 
> address that has been added to the port")
> 
>          # remove the fake MAC address
> -        out = self.dut.send_expect("mac_addr remove %d" % portid + " %s" %
> fake_mac_addr, "testpmd>")
> +        self.dut.send_expect("mac_addr remove %d" % portid + " %s" %
> fake_mac_addr, "testpmd>")
> 
>          # send again one packet to a different MAC address
>          self.whitelist_send_packet(portid, fake_mac_addr)
> -
> +        out = self.dut.get_session_output()
>          pre_rxpkt = cur_rxpkt
> -        out = self.dut.send_expect("show port stats %d" % portid,
> "testpmd> ")
> -        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
> -
> -        # check the packet increase
> -        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
> +        if not out:
> +            cur_rxpkt = 0
> +            # check the packet increase
> +            self.verify(int(cur_rxpkt) == int(pre_rxpkt) -
> self.frames_to_send,

Same comment as previous one.

>                      "Packet has been received on a new MAC address 
> that has been removed from the port")
>          self.dut.send_expect("stop", "testpmd> ")
> 
> --
> 1.9.3

Re: [dts] [PATCH V1]tests/mac_filter: fix FVL stats issue

[Liu, Yong]

Thanks, yingya. Merged with some modifications in commit log.

On 03/28/2018 02:33 PM, han,yingya wrote:
> In testpmd "show port stats" command is to read FVL register.
> Niantic and FVL have different packet statistics when using this command.
> For consistency, call the get_session_output function to check the packet.
> Signed-off-by: han,yingya<yingyax.han@intel.com>

[dts] [PATCH V1]tests/mac_filter: fix FVL stats issue

[han,yingya]

In testpmd "show port stats" command is to read FVL register.
Niantic and FVL have different packet statistics when using this command.
For consistency, call the get_session_output function to check the packet.
Signed-off-by: han,yingya <yingyax.han@intel.com>
---
 tests/TestSuite_mac_filter.py | 46 ++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/tests/TestSuite_mac_filter.py b/tests/TestSuite_mac_filter.py
index 1c58b87..70e23ec 100644
--- a/tests/TestSuite_mac_filter.py
+++ b/tests/TestSuite_mac_filter.py
@@ -99,56 +99,44 @@ class TestWhitelist(TestCase):
         fake_mac_addr = "00:01:01:00:00:00"
         portid = self.dutPorts[0]
         self.dut.send_expect("set promisc %d off" % portid, "testpmd> ")
-
         self.dut.send_expect("clear port stats all", "testpmd> ")
 
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        pre_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
-
         # send one packet with the portid MAC address
         self.whitelist_send_packet(portid, self.dest)
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
+
+        # Niantic and FVL have different packet statistics when using the
+        # "show port stats" command. For consistency, can't use this command.
+        out = self.dut.get_session_output()
+        cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")
         # check the packet increase
-        self.verify(int(cur_rxpkt) == int(pre_rxpkt) + self.frames_to_send,
+        self.verify(int(cur_rxpkt) == self.frames_to_send,
                     "Packet has not been received on default address")
+
         # send one packet to a different MAC address
         # new_mac = self.dut.get_mac_address(portid)
         self.whitelist_send_packet(portid, fake_mac_addr)
-
-        pre_rxpkt = cur_rxpkt
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
-
+        out = self.dut.get_session_output()
         # check the packet DO NOT increase
-        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
+        self.verify("received" not in out,
                     "Packet has been received on a new MAC address that has not been added yet")
-        # add the different MAC address
-        out = self.dut.send_expect("mac_addr add %d" % portid + " %s" % fake_mac_addr, "testpmd>")
 
+        # add the different MAC address
+        self.dut.send_expect("mac_addr add %d" % portid + " %s" % fake_mac_addr, "testpmd>")
         # send again one packet to a different MAC address
         self.whitelist_send_packet(portid, fake_mac_addr)
-
-        pre_rxpkt = cur_rxpkt
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
-
+        out = self.dut.get_session_output()
+        cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")
         # check the packet increase
-        self.verify(int(cur_rxpkt) == int(pre_rxpkt) + self.frames_to_send,
+        self.verify(int(cur_rxpkt) == self.frames_to_send,
                     "Packet has not been received on a new MAC address that has been added to the port")
 
         # remove the fake MAC address
-        out = self.dut.send_expect("mac_addr remove %d" % portid + " %s" % fake_mac_addr, "testpmd>")
-
+        self.dut.send_expect("mac_addr remove %d" % portid + " %s" % fake_mac_addr, "testpmd>")
         # send again one packet to a different MAC address
         self.whitelist_send_packet(portid, fake_mac_addr)
-
-        pre_rxpkt = cur_rxpkt
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
-
+        out = self.dut.get_session_output()
         # check the packet increase
-        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
+        self.verify("received" not in out,
                     "Packet has been received on a new MAC address that has been removed from the port")
         self.dut.send_expect("stop", "testpmd> ")
 
-- 
1.9.3