[dts] [PATCH V1] tests/dcf_lifecycle: modify the acl rule creation method

[dts] [PATCH V1] tests/dcf_lifecycle: modify the acl rule creation method

[Jiale Song]

as the priority of switch rule becomes higher, some rules that support switch cannot be 
downloaded directly to acl. modify the method of creating acl rule

Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 tests/TestSuite_dcf_lifecycle.py | 53 +++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/tests/TestSuite_dcf_lifecycle.py b/tests/TestSuite_dcf_lifecycle.py
index d47ef2b..c7cc79b 100755
--- a/tests/TestSuite_dcf_lifecycle.py
+++ b/tests/TestSuite_dcf_lifecycle.py
@@ -315,6 +315,7 @@ class TestDcfLifeCycle(TestCase):
             "-c {core_mask} "
             "-n {mem_channel} "
             "{allowlist} "
+            "--log-level=ice,7 "
             "--file-prefix={prefix} "
             "-- -i ").format(**{
                 'bin': ''.join(['./',self.vf_dcf_testpmd]),
@@ -374,6 +375,7 @@ class TestDcfLifeCycle(TestCase):
             "-c {core_mask} "
             "-n {mem_channel} "
             "{allowlist} "
+            "--log-level=ice,7 "
             "--file-prefix={prefix} "
             "-- -i ").format(**{
                 'bin': ''.join(['./',self.vf_testpmd2]),
@@ -1020,6 +1022,54 @@ class TestDcfLifeCycle(TestCase):
         self.preset_pmd_res()
         self.vf_create()
 
+    def create_acl_filter_rule(self, rules, session_name="", check_stats=True):
+        """
+        create acl filter rules
+        """
+        if session_name == "":
+            session_name = self.dut
+        p = re.compile(r"Flow rule #(\d+) created")
+        rule_list = []
+        switch_rule = "Succeeded to create (2) flow"
+        acl_rule = "Succeeded to create (4) flow"
+        if isinstance(rules, list):
+            for rule in rules:
+                # create switch rule
+                switch_out = session_name.send_expect(rule, "testpmd> ")
+                self.verify(switch_rule in switch_out, 'switch rule create failed')
+                switch_id = p.findall(switch_out)[0]
+                # create acl rule
+                acl_out = session_name.send_expect(rule, "testpmd> ")
+                # destory switch rule
+                session_name.send_expect("flow destroy %d rule %d" % (0, switch_id), "testpmd> ")
+                if acl_rule in acl_out:
+                    m = p.search(acl_out)
+                    if m:
+                        rule_list.append(m.group(1))
+                    else:
+                        rule_list.append(False)
+        else:
+            # create switch rule
+            switch_out = session_name.send_expect(rules, "testpmd> ")
+            self.verify(switch_rule in switch_out, 'switch rule create failed')
+            switch_id = p.findall(switch_out)[0]
+            # create acl rule
+            acl_out = session_name.send_expect(rules, "testpmd> ")
+            # destory switch rule
+            session_name.send_expect("flow destroy %s rule %s" % (0, switch_id), "testpmd> ")
+            if acl_rule in acl_out:
+                m = p.search(acl_out)
+                if m:
+                    rule_list.append(m.group(1))
+                else:
+                    rule_list.append(False)
+
+        if check_stats:
+            self.verify(all(rule_list), "some rules not created successfully, result %s, rule %s" % (rule_list, rules))
+        else:
+            self.verify(not any(rule_list), "all rules should create failed, result %s" % rule_list)
+        return rule_list
+
     def destroy_resource(self):
         try:
             self.vf_destroy()
@@ -1232,7 +1282,8 @@ class TestDcfLifeCycle(TestCase):
     def pretest_handle_acl_filter(self):
         # Create an ACL rule, and send packet with dst mac of VF1, then it will dropped by VF1.
         rule = 'flow create 0 priority 0 ingress pattern eth / ipv4 / tcp src spec 8010 src mask 65520 / end actions drop / end'
-        self.d_con([rule, "testpmd> ", 15])
+        # acl rule
+        self.create_acl_filter_rule(rule, check_stats=True)
         self.check_rule_list()
         self.send_pkt_to_vf1_first(self.dmac)
         out = self.vf_pmd2_con(['stop', "testpmd> ", 15])
-- 
2.17.1