[dts] [PATCH V1] fix mac_filter check package issue

xu,gang gangx.xu at intel.com
Wed Nov 29 07:59:06 CET 2017


modify mac_filter test_add_remove_mac_address verify method

Signed-off-by: xu,gang <gangx.xu at intel.com>
---
 tests/TestSuite_mac_filter.py | 51 ++++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 35 deletions(-)

diff --git a/tests/TestSuite_mac_filter.py b/tests/TestSuite_mac_filter.py
index 1c58b87..60b2c51 100644
--- a/tests/TestSuite_mac_filter.py
+++ b/tests/TestSuite_mac_filter.py
@@ -100,56 +100,37 @@ class TestWhitelist(TestCase):
         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]+)")
-        # 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(timeout=10)
+        self.verify(str.upper(self.dest) in out,
+            "Packet has not been received on default address")
 
-        pre_rxpkt = cur_rxpkt
-        out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
-        cur_rxpkt = utils.regexp(out, "RX-packets: ([0-9]+)")
+        self.whitelist_send_packet(portid, fake_mac_addr)
 
-        # check the packet DO NOT increase
-        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
-                    "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>")
+        out = self.dut.get_session_output(timeout=10)
+        self.verify(str.upper(fake_mac_addr) not in out,
+            "Packet has been received on a new MAC address that has not been added yet")
+        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]+)")
-
-        # 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")
+        out = self.dut.get_session_output(timeout=10)
+        self.verify(fake_mac_addr in out,
+            "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(timeout=10)
+        self.verify(fake_mac_addr not in out,
+            "Packet has been received on a new MAC address that has been removed from the port")
 
-        # check the packet increase
-        self.verify(int(cur_rxpkt) == int(pre_rxpkt),
-                    "Packet has been received on a new MAC address that has been removed from the port")
         self.dut.send_expect("stop", "testpmd> ")
 
     def test_invalid_addresses(self):
-- 
1.9.3



More information about the dts mailing list