Re: [dts] [PATCH V1] tests/TestSuite_metering_and_policing:Modify scripts to run less time

["Zhu, WenhuiX" <wenhuix.zhu@intel.com>]

Tested-by: Zhu, WenhuiX <wenhuix.zhu@intel.com>

-----Original Message-----
From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhang,yan
Sent: Friday, August 23, 2019 5:07 PM
To: dts@dpdk.org
Cc: Zhang, YanX A <yanx.a.zhang@intel.com>
Subject: [dts] [PATCH V1] tests/TestSuite_metering_and_policing:Modify scripts to run less time

Optimize scapy open and close mode.

Signed-off-by: zhang,yan <yanx.a.zhang@intel.com>
---
 tests/TestSuite_metering_and_policing.py | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_metering_and_policing.py b/tests/TestSuite_metering_and_policing.py
index c4c83d6..77da805 100644
--- a/tests/TestSuite_metering_and_policing.py
+++ b/tests/TestSuite_metering_and_policing.py
@@ -45,6 +45,22 @@ from dut import Dut
 
 
 class TestMeteringAndPolicing(TestCase):
+    scapyCmds = []
+
+    def start_scapy(self):
+        self.tester.scapy_foreground()
+        self.tester.send_expect('scapy', '>>> ', 10)
+        self.scapy_status = True
+
+    def end_scapy(self):
+        self.tester.send_expect("exit()", "#")
+        self.scapy_status = False
+
+    def scapy_execute(self, timeout=60):
+        for cmd in self.scapyCmds:
+            self.tester.send_expect(cmd, ">>> ", timeout)
+
+        self.scapyCmds = []
 
     def copy_config_files_to_dut(self):
         """
@@ -219,10 +235,10 @@ class TestMeteringAndPolicing(TestCase):
             if protocol == "UDP":
                 proto_str = "nh=17"
 
-        self.tester.scapy_append(
+        self.scapyCmds.append(
             'sendp([Ether(dst="%s")/%s(src="%s",dst="%s",%s)/%s(sport=%d,dport=%d)/Raw(load="P"*%d)], iface="%s")'
             % (self.dut_p0_mac, tag, src_ip, dst_ip, proto_str, protocol, fwd_port, fwd_port, pktsize, source_port))
-        self.tester.scapy_execute()
+        self.scapy_execute()
 
     def send_packet_and_check(self, ip_ver, protocol, fwd_port, pktsize, expect_port):
         """
@@ -296,6 +312,7 @@ class TestMeteringAndPolicing(TestCase):
         self.dut_p0_mac = self.dut.get_mac_address(self.dut_ports[0])
         self.port_id = len(self.dut_ports)
         self.copy_config_files_to_dut()
+        self.start_scapy()
 
     def set_up(self):
         """
@@ -653,4 +670,5 @@ class TestMeteringAndPolicing(TestCase):
         """
         Run after each test suite.
         """
-        pass
+        if self.scapy_status:
+            self.end_scapy()
-- 
2.17.2