[11/28] tests/TestSuite_l3fwdacl:Modify the hard coded app parameter to call the platform interface

Message ID 20201208100627.9792-12-junx.w.zhou@intel.com (mailing list archive)
State Accepted
Headers
Series Modify the hard coded app parameter to call the platform interface |

Commit Message

Zhou, JunX W Dec. 8, 2020, 10:06 a.m. UTC
  Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
 tests/TestSuite_l3fwdacl.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
  

Patch

diff --git a/tests/TestSuite_l3fwdacl.py b/tests/TestSuite_l3fwdacl.py
index cc87e172..7e0ad989 100644
--- a/tests/TestSuite_l3fwdacl.py
+++ b/tests/TestSuite_l3fwdacl.py
@@ -172,8 +172,8 @@  class TestL3fwdacl(TestCase):
         if scalar:
             extra_args = '--alg="scalar"'
 
-        cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" %s' % \
-                  (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(),
+        cmdline = '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" %s' % \
+                  (self.app_l3fwd_acl_path, self.eal_para,
                    self.port_mask, self.dut_ports[0], self.dut_ports[1],
                    TestL3fwdacl.acl_ipv4_db,
                    TestL3fwdacl.acl_ipv6_db,
@@ -591,8 +591,8 @@  class TestL3fwdacl(TestCase):
         rule_list.append(TestL3fwdacl.default_rule)
         self.create_acl_ipv4_db(rule_list)
 
-        cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"' % \
-                  (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(),
+        cmdline = '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"' % \
+                  (self.app_l3fwd_acl_path, self.eal_para,
                    self.port_mask, self.dut_ports[0], self.dut_ports[1],
                    TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db)
 
@@ -610,8 +610,8 @@  class TestL3fwdacl(TestCase):
         rule_list.append(TestL3fwdacl.default_rule)
         self.create_acl_ipv6_db(rule_list)
 
-        cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"' % \
-                  (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(),
+        cmdline = '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"' % \
+                  (self.app_l3fwd_acl_path, self.eal_para,
                    self.port_mask, self.dut_ports[0], self.dut_ports[1],
                    TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db)
 
@@ -636,6 +636,7 @@  class TestL3fwdacl(TestCase):
         cores = self.get_core_list()
         self.verify(cores is not None, "Insufficient cores for speed testing")
 
+        self.eal_para = self.dut.create_eal_parameters(cores=self.get_core_list())
         self.core_mask = utils.create_mask(cores)
         print("Core mask: %s" % self.core_mask)
 
@@ -840,8 +841,8 @@  class TestL3fwdacl(TestCase):
         rule_list_ipv4.append(TestL3fwdacl.invalid_port_rule_ipv4)
         self.create_acl_ipv4_db(rule_list_ipv4)
 
-        cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"' % \
-                  (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(),
+        cmdline = '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"' % \
+                  (self.app_l3fwd_acl_path, self.eal_para,
                    self.port_mask, self.dut_ports[0], self.dut_ports[1],
                    TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db)
 
@@ -852,8 +853,8 @@  class TestL3fwdacl(TestCase):
         rule_list_ipv6.append(TestL3fwdacl.invalid_port_rule_ipv6)
         self.create_acl_ipv6_db(rule_list_ipv6)
 
-        cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"' % \
-                  (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(),
+        cmdline = '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"' % \
+                  (self.app_l3fwd_acl_path, self.eal_para,
                    self.port_mask, self.dut_ports[0], self.dut_ports[1],
                    TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db)