* [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface
@ 2020-12-08 10:05 Zhou Jun
2020-12-08 10:06 ` [dts] [dts 01/28] tests/TestSuite_hello_world:Modify " Zhou Jun
` (29 more replies)
0 siblings, 30 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:05 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Modify the hard coded app parameter to call the platform interface
Zhou Jun (28):
tests/TestSuite_hello_world:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_hotplug:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_inline_ipsec:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_interrupt_pmd:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_ip_pipeline:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_ipfrag:Modify the hard coded app parameter to call the
platform interface
tests/TestSuite_ipv4_reassembly:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_keep_alive:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_kni:Modify the hard coded app parameter to call the
platform interface
tests/TestSuite_l2fwd_jobstats:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_l3fwdacl:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_link_status_interrupt:Modify the hard coded app
parameter to call the platform interface
tests/TestSuite_metering_and_policing:Modify the hard coded app
parameter to call the platform interface
tests/TestSuite_multicast:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_multiprocess:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_packet_ordering:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_pmdpcap:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_pmdrss_hash:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_pmdrssreta:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_ptpclient:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_queue_start_stop:Modify the hard coded app parameter
to call the platform interface
tests/TestSuite_rxtx_callbacks:Modify the hard coded app parameter to
call the platform interface
tests/TestSuite_short_live:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_skeleton:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_softnic:Modify the hard coded app parameter to call
the platform interface
tests/TestSuite_timer:Modify the hard coded app parameter to call the
platform interface
tests/TestSuite_tso:Modify the hard coded app parameter to call the
platform interface
tests/TestSuite_userspace_ethtool:Modify the hard coded app parameter
to call the platform interface
tests/TestSuite_hello_world.py | 8 ++--
tests/TestSuite_hotplug.py | 5 ++-
tests/TestSuite_inline_ipsec.py | 13 +++---
tests/TestSuite_interrupt_pmd.py | 13 ++++--
tests/TestSuite_ip_pipeline.py | 50 +++++++++++-------------
tests/TestSuite_ipfrag.py | 7 +---
tests/TestSuite_ipv4_reassembly.py | 5 ++-
tests/TestSuite_keep_alive.py | 5 ++-
tests/TestSuite_kni.py | 6 ++-
tests/TestSuite_l2fwd_jobstats.py | 3 +-
tests/TestSuite_l3fwdacl.py | 21 +++++-----
tests/TestSuite_link_status_interrupt.py | 17 ++++----
tests/TestSuite_metering_and_policing.py | 13 +++---
tests/TestSuite_multicast.py | 5 +--
tests/TestSuite_multiprocess.py | 25 ++++++------
tests/TestSuite_packet_ordering.py | 5 ++-
tests/TestSuite_pmdpcap.py | 12 +++---
tests/TestSuite_pmdrss_hash.py | 19 ++++-----
tests/TestSuite_pmdrssreta.py | 3 +-
tests/TestSuite_ptpclient.py | 5 ++-
tests/TestSuite_queue_start_stop.py | 3 +-
tests/TestSuite_rxtx_callbacks.py | 3 +-
tests/TestSuite_short_live.py | 12 +++---
tests/TestSuite_skeleton.py | 3 +-
tests/TestSuite_softnic.py | 14 +++++--
tests/TestSuite_timer.py | 4 +-
tests/TestSuite_tso.py | 12 +++---
tests/TestSuite_userspace_ethtool.py | 5 ++-
28 files changed, 156 insertions(+), 140 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 01/28] tests/TestSuite_hello_world:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 02/28] tests/TestSuite_hotplug:Modify " Zhou Jun
` (28 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_hello_world.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/TestSuite_hello_world.py b/tests/TestSuite_hello_world.py
index cd843b53..8e2ffd90 100644
--- a/tests/TestSuite_hello_world.py
+++ b/tests/TestSuite_hello_world.py
@@ -66,8 +66,8 @@ class TestHelloWorld(TestCase):
# get the mask for the first core
cores = self.dut.get_core_list('1S/1C/1T')
- coreMask = utils.create_mask(cores)
- cmdline = "./%s -n 1 -c " % self.app_helloworld_path + coreMask
+ eal_para = self.dut.create_eal_parameters(cores='1S/1C/1T')
+ cmdline = "./%s %s" % (self.app_helloworld_path, eal_para)
out = self.dut.send_expect(cmdline, "# ", 30)
self.verify("hello from core %s" % cores[0] in out, "EAL not started on core%s" % cores[0])
@@ -86,9 +86,9 @@ class TestHelloWorld(TestCase):
else:
available_max_lcore = len(cores) + 1
- coreMask = utils.create_mask(cores[:available_max_lcore - 1])
+ eal_para = self.dut.create_eal_parameters(cores=cores[:available_max_lcore - 1])
- cmdline = "./%s -n 1 -c " % self.app_helloworld_path + coreMask
+ cmdline = "./%s %s " % (self.app_helloworld_path, eal_para)
out = self.dut.send_expect(cmdline, "# ", 50)
for i in range(available_max_lcore - 1):
self.verify("hello from core %s" % cores[i] in out, "EAL not started on core%s" % cores[i])
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 02/28] tests/TestSuite_hotplug:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
2020-12-08 10:06 ` [dts] [dts 01/28] tests/TestSuite_hello_world:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 03/28] tests/TestSuite_inline_ipsec:Modify " Zhou Jun
` (27 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_hotplug.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_hotplug.py b/tests/TestSuite_hotplug.py
index 22df2306..f40c291c 100644
--- a/tests/TestSuite_hotplug.py
+++ b/tests/TestSuite_hotplug.py
@@ -55,6 +55,7 @@ class TestPortHotPlug(TestCase):
self.dut_ports = self.dut.get_ports(self.nic)
self.verify(len(self.dut_ports) >= 2, "Insufficient ports")
cores = self.dut.get_core_list("1S/4C/1T")
+ self.eal_para = self.dut.create_eal_parameters(cores='1S/4C/1T')
self.coremask = utils.create_mask(cores)
self.port = len(self.dut_ports) - 1
if self.drivername == "vfio-pci:noiommu":
@@ -93,7 +94,7 @@ class TestPortHotPlug(TestCase):
"""
first run testpmd after attach port
"""
- cmd = "%s -c %s -n %s -- -i" % (self.path, self.coremask, self.dut.get_memory_channels())
+ cmd = "%s %s -- -i" % (self.path, self.eal_para)
self.dut.send_expect(cmd, "testpmd>", 60)
session_secondary = self.dut.new_session()
session_secondary.send_expect(
@@ -137,7 +138,7 @@ class TestPortHotPlug(TestCase):
"./usertools/dpdk-devbind.py --bind=%s %s" % (self.driver_name, self.dut.ports_info[self.port]['pci']), "#",
60)
self.dut.close_session(session_secondary)
- cmd = "%s -c %s -n %s -- -i" % (self.path, self.coremask, self.dut.get_memory_channels())
+ cmd = "%s %s -- -i" % (self.path, self.eal_para)
self.dut.send_expect(cmd, "testpmd>", 60)
self.detach(self.port)
self.attach(self.port)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 03/28] tests/TestSuite_inline_ipsec:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
2020-12-08 10:06 ` [dts] [dts 01/28] tests/TestSuite_hello_world:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 02/28] tests/TestSuite_hotplug:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 04/28] tests/TestSuite_interrupt_pmd:Modify " Zhou Jun
` (26 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_inline_ipsec.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/TestSuite_inline_ipsec.py b/tests/TestSuite_inline_ipsec.py
index 2b599374..2b9db77e 100644
--- a/tests/TestSuite_inline_ipsec.py
+++ b/tests/TestSuite_inline_ipsec.py
@@ -93,6 +93,7 @@ class TestInlineIpsec(TestCase):
out = self.dut.build_dpdk_apps("./examples/ipsec-secgw")
self.verify("Error" not in out, "compilation error 1")
self.verify("No such file" not in out, "compilation error 2")
+ self.eal_para = self.dut.create_eal_parameters(cores=[20, 21])
self.cfg_prepare()
@@ -207,11 +208,11 @@ class TestInlineIpsec(TestCase):
verify Ipsec receive package
"""
if jumboframe is not None:
- cmd = self.path + " -l 20,21 -w %s -w %s --vdev 'crypto_null' --log-level 8 --socket-mem 1024,1024 -- -p 0xf -P -u 0x2 -j 9200 --mtu %s --config='%s' -f %s" % (
- self.portpci_0, self.portpci_1, jumboframe, config, file_name)
+ cmd = self.path + " %s --vdev 'crypto_null' --log-level 8 --socket-mem 1024,1024 -- -p 0xf -P -u 0x2 -j 9200 --mtu %s --config='%s' -f %s" % (
+ self.eal_para, jumboframe, config, file_name)
else:
- cmd = self.path + " -l 20,21 -w %s -w %s --vdev 'crypto_null' --log-level 8 --socket-mem 1024,1024 -- -p 0xf -P -u 0x2 --config='%s' -f %s" % (
- self.portpci_0, self.portpci_1, config, file_name)
+ cmd = self.path + " %s --vdev 'crypto_null' --log-level 8 --socket-mem 1024,1024 -- -p 0xf -P -u 0x2 --config='%s' -f %s" % (
+ self.eal_para, config, file_name)
self.dut.send_expect(cmd, "IPSEC", 60)
@@ -341,8 +342,8 @@ class TestInlineIpsec(TestCase):
"""
test Ipsec Encryption Decryption
"""
- cmd = self.path + " -l 20,21 -w %s -w %s --vdev 'crypto_null' --log-level 8 --socket-mem 1024,1 -- -p 0xf -P -u 0x2 --config='%s' -f %s" % (
- self.portpci_0, self.portpci_1, '(0,0,21),(1,0,21)', '/root/dpdk/enc_dec.cfg')
+ cmd = self.path + " %s --vdev 'crypto_null' --log-level 8 --socket-mem 1024,1 -- -p 0xf -P -u 0x2 --config='%s' -f %s" % (
+ self.eal_para, '(0,0,21),(1,0,21)', '/root/dpdk/enc_dec.cfg')
self.dut.send_expect(cmd, "IPSEC", 60)
session_receive = self.tester.create_session(
name='receive_encryption_package')
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 04/28] tests/TestSuite_interrupt_pmd:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (2 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 03/28] tests/TestSuite_inline_ipsec:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 05/28] tests/TestSuite_ip_pipeline:Modify " Zhou Jun
` (25 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_interrupt_pmd.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/TestSuite_interrupt_pmd.py b/tests/TestSuite_interrupt_pmd.py
index 752c673a..e5e3751d 100644
--- a/tests/TestSuite_interrupt_pmd.py
+++ b/tests/TestSuite_interrupt_pmd.py
@@ -50,6 +50,7 @@ class TestInterruptPmd(TestCase):
self.dut_ports = self.dut.get_ports(self.nic)
self.verify(len(self.dut_ports) >= 2, "Insufficient ports")
cores = self.dut.get_core_list("1S/4C/1T")
+ self.eal_para = self.dut.create_eal_parameters(cores='1S/4C/1T')
self.coremask = utils.create_mask(cores)
self.path = self.dut.apps_name["l3fwd-power"]
@@ -88,21 +89,25 @@ class TestInterruptPmd(TestCase):
pass
def test_different_queue(self):
- cmd = "%s -c %s -n 4 -- -p 0x3 -P --config='(0,0,1),(1,0,2)' "% (self.path, self.coremask)
+ cmd = "%s %s -- -p 0x3 -P --config='(0,0,1),(1,0,2)' "% (self.path, self.eal_para)
self.dut.send_expect(cmd, "L3FWD_POWER", 60)
portQueueLcore = self.trafficFlow["Flow1"]
self.verifier_result(2, 2, portQueueLcore)
self.dut.kill_all()
- cmd = "%s -c 0x3f -n 4 -- -p 0x3 -P --config='(0,0,0),(0,1,1),(0,2,2),(0,3,3),(0,4,4)' "% self.path
+ cores = list(range(6))
+ eal_para = self.dut.create_eal_parameters(cores=cores)
+ cmd = "%s %s -- -p 0x3 -P --config='(0,0,0),(0,1,1),(0,2,2),(0,3,3),(0,4,4)' "% (self.path, eal_para)
self.dut.send_expect(cmd, "L3FWD_POWER", 120)
portQueueLcore = self.trafficFlow["Flow2"]
self.verifier_result(20, 1, portQueueLcore)
self.dut.kill_all()
- cmd = "%s -c 0xffffff -n 4 -- -p 0x3 -P --config='(0,0,0),(0,1,1),(0,2,2),(0,3,3),\
+ cores = list(range(24))
+ eal_para = self.dut.create_eal_parameters(cores=cores)
+ cmd = "%s %s -- -p 0x3 -P --config='(0,0,0),(0,1,1),(0,2,2),(0,3,3),\
(0,4,4),(0,5,5),(0,6,6),(0,7,7),(1,0,8),(1,1,9),(1,2,10),(1,3,11),\
- (1,4,12),(1,5,13),(1,6,14)' "% self.path
+ (1,4,12),(1,5,13),(1,6,14)' "% (self.path, eal_para)
self.dut.send_expect(cmd, "L3FWD_POWER", 60)
portQueueLcore = self.trafficFlow["Flow3"]
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 05/28] tests/TestSuite_ip_pipeline:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (3 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 04/28] tests/TestSuite_interrupt_pmd:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 06/28] tests/TestSuite_ipfrag:Modify " Zhou Jun
` (24 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_ip_pipeline.py | 50 +++++++++++++++-------------------
1 file changed, 22 insertions(+), 28 deletions(-)
diff --git a/tests/TestSuite_ip_pipeline.py b/tests/TestSuite_ip_pipeline.py
index c9a473ec..0d5a114b 100644
--- a/tests/TestSuite_ip_pipeline.py
+++ b/tests/TestSuite_ip_pipeline.py
@@ -217,6 +217,8 @@ class TestIPPipeline(TestCase):
self.vf2_mac = "00:11:22:33:44:57"
self.vf3_mac = "00:11:22:33:44:58"
+ ports = [self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci]
+ self.eal_para = self.dut.create_eal_parameters(cores=list(range(2)), ports=ports)
self.sriov_vfs_port = []
self.session_secondary = self.dut.new_session()
@@ -245,11 +247,9 @@ class TestIPPipeline(TestCase):
cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/route.cli" % self.dut_p3_pci
self.dut.send_expect(cmd, "# ", 20)
- DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
- .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
SCRIPT_FILE = "./examples/ip_pipeline/examples/route.cli"
- cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
+ cmd = "{0} {1} -- -s {2}".format(self.app_ip_pipline_path, self.eal_para, SCRIPT_FILE)
self.dut.send_expect(cmd, "30:31:32:33:34:35", 60)
#rule 0 test
@@ -313,11 +313,9 @@ class TestIPPipeline(TestCase):
cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/firewall.cli" % self.dut_p3_pci
self.dut.send_expect(cmd, "# ", 20)
- DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
- .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
SCRIPT_FILE = "./examples/ip_pipeline/examples/firewall.cli"
- cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
+ cmd = "{0} {1} -- -s {2}".format(self.app_ip_pipline_path, self.eal_para, SCRIPT_FILE)
self.dut.send_expect(cmd, "fwd port 3", 60)
#rule 0 test
@@ -381,11 +379,9 @@ class TestIPPipeline(TestCase):
cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/flow.cli" % self.dut_p3_pci
self.dut.send_expect(cmd, "# ", 20)
- DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
- .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
SCRIPT_FILE = "./examples/ip_pipeline/examples/flow.cli"
- cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
+ cmd = "{0} {1} -- -s {2}".format(self.app_ip_pipline_path, self.eal_para, SCRIPT_FILE)
self.dut.send_expect(cmd, "fwd port 3", 60)
#rule 0 test
@@ -449,11 +445,9 @@ class TestIPPipeline(TestCase):
cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/l2fwd.cli" % self.dut_p3_pci
self.dut.send_expect(cmd, "# ", 20)
- DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
- .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
SCRIPT_FILE = "./examples/ip_pipeline/examples/l2fwd.cli"
- cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
+ cmd = "{0} {1} -- -s {2}".format(self.app_ip_pipline_path, self.eal_para, SCRIPT_FILE)
self.dut.send_expect(cmd, "fwd port 2", 60)
#rule 0 test
@@ -519,22 +513,22 @@ class TestIPPipeline(TestCase):
cmd = "sed -i '/mempool MEMPOOL0/a\link LINK0 dev %s rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on' ./examples/ip_pipeline/examples/l2fwd.cli" % self.sriov_vfs_port[0][0].pci
self.dut.send_expect(cmd, "# ", 20)
- DUT_PF_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
- .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
- PF_SCRIPT_FILE = "--file-prefix=pf --socket-mem 1024,1024"
+ DUT_PF_PORTS = [self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci]
+ PF_SCRIPT_FILE = "--socket-mem 1024,1024"
- DUT_VF_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
- .format(self.sriov_vfs_port[0][0].pci, self.sriov_vfs_port[1][0].pci, self.sriov_vfs_port[2][0].pci, self.sriov_vfs_port[3][0].pci)
+ DUT_VF_PORTS = [self.sriov_vfs_port[0][0].pci, self.sriov_vfs_port[1][0].pci, self.sriov_vfs_port[2][0].pci, self.sriov_vfs_port[3][0].pci]
VF_SCRIPT_FILE = "./examples/ip_pipeline/examples/l2fwd.cli"
- pf_cmd = "{0} -c 0xf0 -n 4 {1} {2} -- -i".format(self.app_testpmd_path, DUT_PF_PORTS, PF_SCRIPT_FILE)
+ pf_eal_para = self.dut.create_eal_parameters(cores=list(range(4, 8)), prefix='pf', ports=DUT_PF_PORTS)
+ pf_cmd = "{0} {1} {2} -- -i".format(self.app_testpmd_path, pf_eal_para, PF_SCRIPT_FILE)
self.dut.send_expect(pf_cmd, "testpmd> ", 60)
self.dut.send_expect("set vf mac addr 0 0 %s" % self.vf0_mac, "testpmd> ", 30)
self.dut.send_expect("set vf mac addr 1 0 %s" % self.vf1_mac, "testpmd> ", 30)
self.dut.send_expect("set vf mac addr 2 0 %s" % self.vf2_mac, "testpmd> ", 30)
self.dut.send_expect("set vf mac addr 3 0 %s" % self.vf3_mac, "testpmd> ", 30)
- vf_cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_VF_PORTS, VF_SCRIPT_FILE)
+ vf_eal_para = self.dut.create_eal_parameters(cores=list(range(2)), ports=DUT_VF_PORTS)
+ vf_cmd = "{0} {1} -- -s {2}".format(self.app_ip_pipline_path, vf_eal_para, VF_SCRIPT_FILE)
self.session_secondary.send_expect(vf_cmd, "fwd port 2", 60)
#rule 0 test
@@ -599,11 +593,11 @@ class TestIPPipeline(TestCase):
cmd = "sed -i '/mempool MEMPOOL0/a\link LINK0 dev %s rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on' ./examples/ip_pipeline/examples/l2fwd.cli" % self.sriov_vfs_port[0][0].pci
self.dut.send_expect(cmd, "# ", 20)
- DUT_VF_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
- .format(self.sriov_vfs_port[0][0].pci, self.sriov_vfs_port[1][0].pci, self.sriov_vfs_port[2][0].pci, self.sriov_vfs_port[3][0].pci)
+ DUT_VF_PORTS = [self.sriov_vfs_port[0][0].pci, self.sriov_vfs_port[1][0].pci, self.sriov_vfs_port[2][0].pci, self.sriov_vfs_port[3][0].pci]
VF_SCRIPT_FILE = "./examples/ip_pipeline/examples/l2fwd.cli"
- vf_cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_VF_PORTS, VF_SCRIPT_FILE)
+ vf_eal_para = self.dut.create_eal_parameters(cores=list(range(2)), ports=DUT_VF_PORTS)
+ vf_cmd = "{0} {1} -- -s {2}".format(self.app_ip_pipline_path, vf_eal_para, VF_SCRIPT_FILE)
self.session_secondary.send_expect(vf_cmd, "fwd port 2", 60)
#rule 0 test
@@ -665,11 +659,11 @@ class TestIPPipeline(TestCase):
cmd = "sed -i -e 's/0000:02:00.1/%s/' ./examples/ip_pipeline/examples/tap.cli" % self.dut_p1_pci
self.dut.send_expect(cmd, "# ", 20)
- DUT_PORTS = " -w {0} -w {1} "\
- .format(self.dut_p0_pci, self.dut_p1_pci)
+ DUT_PORTS = [self.dut_p0_pci, self.dut_p1_pci]
SCRIPT_FILE = "./examples/ip_pipeline/examples/tap.cli"
- cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
+ eal_para = self.dut.create_eal_parameters(cores=list(range(2)), ports=DUT_PORTS)
+ cmd = "{0} {1} -- -s {2}".format(self.app_ip_pipline_path, eal_para, SCRIPT_FILE)
self.dut.send_expect(cmd, "fwd port 3", 60)
tap_session = self.dut.new_session()
@@ -722,11 +716,11 @@ class TestIPPipeline(TestCase):
cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/rss.cli" % self.dut_p3_pci
self.dut.send_expect(cmd, "# ", 20)
- DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
- .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
+ DUT_PORTS = [self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci]
SCRIPT_FILE = "./examples/ip_pipeline/examples/rss.cli"
- cmd = "{0} -c 0x1f -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
+ eal_para = self.dut.create_eal_parameters(cores=list(range(5)), ports=DUT_PORTS)
+ cmd = "{0} {1} -- -s {2}".format(self.app_ip_pipline_path, eal_para, SCRIPT_FILE)
self.dut.send_expect(cmd, "PIPELINE3 enable", 60)
#rule 0 test
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 06/28] tests/TestSuite_ipfrag:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (4 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 05/28] tests/TestSuite_ip_pipeline:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 07/28] tests/TestSuite_ipv4_reassembly:Modify " Zhou Jun
` (23 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_ipfrag.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/tests/TestSuite_ipfrag.py b/tests/TestSuite_ipfrag.py
index ba64e168..84725dad 100644
--- a/tests/TestSuite_ipfrag.py
+++ b/tests/TestSuite_ipfrag.py
@@ -124,19 +124,16 @@ class TestIpfrag(TestCase):
self.verify("No such file" not in out, "compilation error 2")
cores = self.dut.get_core_list("1S/1C/2T")
+ self.eal_para = self.dut.create_eal_parameters(cores='1S/1C/2T')
coremask = utils.create_mask(cores)
portmask = utils.create_mask([P0, P1])
numPortThread = len([P0, P1]) / len(cores)
result = True
errString = ''
- eal_param = ""
- for i in [P0, P1]:
- eal_param += " -w %s" % self.dut.ports_info[i]['pci']
# run ipv4_frag
self.app_ip_fragmentation_path = self.dut.apps_name['ip_fragmentation']
- self.dut.send_expect("%s -c %s -n %d %s -- -p %s -q %s" % (self.app_ip_fragmentation_path, coremask,
- self.dut.get_memory_channels(), eal_param, portmask,
+ self.dut.send_expect("%s %s -- -p %s -q %s" % (self.app_ip_fragmentation_path, self.eal_para, portmask,
int(numPortThread)), "Link [Uu]p", 120)
time.sleep(2)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 07/28] tests/TestSuite_ipv4_reassembly:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (5 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 06/28] tests/TestSuite_ipfrag:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 08/28] tests/TestSuite_keep_alive:Modify " Zhou Jun
` (22 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_ipv4_reassembly.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_ipv4_reassembly.py b/tests/TestSuite_ipv4_reassembly.py
index f32bcea5..20164474 100644
--- a/tests/TestSuite_ipv4_reassembly.py
+++ b/tests/TestSuite_ipv4_reassembly.py
@@ -71,6 +71,7 @@ class IpReassemblyTestConfig(object):
self.packets_config()
def cpu_config(self):
+ self.eal_para = self.dut.create_eal_parameters(cores='1S/1C/1T')
self.core_list = self.test_case.dut.get_core_list('1S/1C/1T')
self.core_mask = utils.create_mask(self.core_list)
self.memory_channels = self.test_case.dut.get_memory_channels()
@@ -148,8 +149,8 @@ class TestIpReassembly(TestCase):
Execute the example app and checks for errors.
"""
- command = ('./%s -c {core_mask} ' % self.app_ip_reassembly_path +
- '-n {memory_channels} -- -p {dut_port_mask} ' +
+ command = ('./%s {eal_para} ' % self.app_ip_reassembly_path +
+ '-- -p {dut_port_mask} ' +
'--maxflows={maxflows} --flowttl={flowttl} {extra_args}')
self.dut.send_expect(
command.format(**self.test_config.__dict__), 'Link [Uu]p')
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 08/28] tests/TestSuite_keep_alive:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (6 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 07/28] tests/TestSuite_ipv4_reassembly:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 09/28] tests/TestSuite_kni:Modify " Zhou Jun
` (21 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_keep_alive.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_keep_alive.py b/tests/TestSuite_keep_alive.py
index 7bee4f03..4d350d79 100644
--- a/tests/TestSuite_keep_alive.py
+++ b/tests/TestSuite_keep_alive.py
@@ -67,8 +67,9 @@ class TestKeepAlive(TestCase):
def test_keep_alive(self):
"""
Verify netmap compatibility with one port
- """
- cmd = self.app_l2fwd_keepalive_path + " -c f -n 4 -- -q 8 -p ffff -K 10"
+ """
+ eal_para = self.dut.create_eal_parameters(cores=list(range(4)))
+ cmd = self.app_l2fwd_keepalive_path + " %s -- -q 8 -p ffff -K 10" % eal_para
self.dut.send_expect(cmd,"Port statistics",60)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 09/28] tests/TestSuite_kni:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (7 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 08/28] tests/TestSuite_keep_alive:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 10/28] tests/TestSuite_l2fwd_jobstats:Modify " Zhou Jun
` (20 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_kni.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py
index a65fbf46..0a300539 100644
--- a/tests/TestSuite_kni.py
+++ b/tests/TestSuite_kni.py
@@ -341,9 +341,11 @@ class TestKni(TestCase):
config_param = self.build_config_param()
+ eal_para = self.dut.create_eal_parameters(
+ cores=self.config['rx_cores'] + self.config['tx_cores'] + self.config['kernel_cores'])
out_kni = self.dut.send_expect(
- './%s -c %s -n %d -- -P -p %s %s -m &' %
- (self.app_kni_path, core_mask, self.dut.get_memory_channels(), port_mask, config_param),
+ './%s %s -- -P -p %s %s -m &' %
+ (self.app_kni_path, eal_para, port_mask, config_param),
"Link [Uu]p", 20)
time.sleep(5)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 10/28] tests/TestSuite_l2fwd_jobstats:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (8 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 09/28] tests/TestSuite_kni:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 11/28] tests/TestSuite_l3fwdacl:Modify " Zhou Jun
` (19 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_l2fwd_jobstats.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/TestSuite_l2fwd_jobstats.py b/tests/TestSuite_l2fwd_jobstats.py
index c00e39c1..6c104168 100644
--- a/tests/TestSuite_l2fwd_jobstats.py
+++ b/tests/TestSuite_l2fwd_jobstats.py
@@ -56,6 +56,7 @@ class TestL2fwdJobstats(TestCase):
cores = self.dut.get_core_list("1S/4C/1T")
self.coremask = utils.create_mask(cores)
+ self.eal_para = self.dut.create_eal_parameters(cores='1S/4C/1T')
dut_port0 = self.dut_ports[0]
dut_port1 = self.dut_ports[1]
self.tx_ports = [dut_port0, dut_port1]
@@ -76,7 +77,7 @@ class TestL2fwdJobstats(TestCase):
Verify l2fwd jobstats is correct
"""
path = self.dut.apps_name["l2fwd-jobstats"]
- cmd = path + " -c %s -n 4 -- -q 2 -p 0x03 -l" % (self.coremask)
+ cmd = path + " %s -- -q 2 -p 0x03 -l" % (self.eal_para)
self.dut.send_expect(cmd, "Port statistics", 60)
self.scapy_send_packet(100000)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 11/28] tests/TestSuite_l3fwdacl:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (9 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 10/28] tests/TestSuite_l2fwd_jobstats:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 12/28] tests/TestSuite_link_status_interrupt:Modify " Zhou Jun
` (18 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_l3fwdacl.py | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
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)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 12/28] tests/TestSuite_link_status_interrupt:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (10 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 11/28] tests/TestSuite_l3fwdacl:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 13/28] tests/TestSuite_metering_and_policing:Modify " Zhou Jun
` (17 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_link_status_interrupt.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/tests/TestSuite_link_status_interrupt.py b/tests/TestSuite_link_status_interrupt.py
index 99783544..e5fd69ed 100644
--- a/tests/TestSuite_link_status_interrupt.py
+++ b/tests/TestSuite_link_status_interrupt.py
@@ -54,6 +54,7 @@ class TestLinkStatusInterrupt(TestCase):
cores = self.dut.get_core_list("1S/4C/1T")
self.coremask = utils.create_mask(cores)
self.portmask = utils.create_mask(self.dut_ports)
+ self.eal_para = self.dut.create_eal_parameters(cores='1S/4C/1T')
self.app_link_status_interrupt_path = self.dut.apps_name['link_status_interrupt']
# build sample app
@@ -94,8 +95,8 @@ class TestLinkStatusInterrupt(TestCase):
"""
if self.drivername == "igb_uio":
- cmdline = self.app_link_status_interrupt_path + " -c %s -n %s -- -p %s " % (
- self.coremask, self.dut.get_memory_channels(), self.portmask)
+ cmdline = self.app_link_status_interrupt_path + " %s -- -p %s " % (
+ self.eal_para, self.portmask)
for mode in self.basic_intr_mode:
self.dut.send_expect("rmmod -f igb_uio", "#", 20)
self.dut.send_expect(
@@ -110,8 +111,8 @@ class TestLinkStatusInterrupt(TestCase):
self.dut.send_expect("^C", "#", 60)
elif self.drivername == "vfio-pci":
for mode in self.basic_intr_mode:
- cmdline = self.app_link_status_interrupt_path + " -c %s -n %s --vfio-intr=%s -- -p %s" % (
- self.coremask, self.dut.get_memory_channels(), mode, self.portmask)
+ cmdline = self.app_link_status_interrupt_path + " %s --vfio-intr=%s -- -p %s" % (
+ self.eal_para, mode, self.portmask)
self.dut.send_expect(cmdline, "statistics", 120)
self.set_link_status_and_verify(self.dut_ports[0], 'Down')
self.set_link_status_and_verify(self.dut_ports[0], 'Up')
@@ -123,8 +124,8 @@ class TestLinkStatusInterrupt(TestCase):
sent packet, check packets received.
"""
if self.drivername == "igb_uio":
- cmdline = self.app_link_status_interrupt_path + " -c %s -n %s -- -p %s " % (
- self.coremask, self.dut.get_memory_channels(), self.portmask)
+ cmdline = self.app_link_status_interrupt_path + "%s -- -p %s " % (
+ self.eal_para, self.portmask)
for mode in self.basic_intr_mode:
self.dut.send_expect("rmmod -f igb_uio", "#", 20)
self.dut.send_expect(
@@ -147,8 +148,8 @@ class TestLinkStatusInterrupt(TestCase):
self.dut.send_expect("^C", "#", 60)
elif self.drivername == "vfio-pci":
for mode in self.basic_intr_mode:
- cmdline = self.app_link_status_interrupt_path + " -c %s -n %s --vfio-intr=%s -- -p %s" % (
- self.coremask, self.dut.get_memory_channels(), mode, self.portmask)
+ cmdline = self.app_link_status_interrupt_path + " %s --vfio-intr=%s -- -p %s" % (
+ self.eal_para, mode, self.portmask)
self.dut.send_expect(cmdline, "Aggregate statistics", 60)
for port in self.dut_ports:
self.set_link_status_and_verify(
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 13/28] tests/TestSuite_metering_and_policing:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (11 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 12/28] tests/TestSuite_link_status_interrupt:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 14/28] tests/TestSuite_multicast:Modify " Zhou Jun
` (16 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_metering_and_policing.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tests/TestSuite_metering_and_policing.py b/tests/TestSuite_metering_and_policing.py
index c481d451..4dec3198 100644
--- a/tests/TestSuite_metering_and_policing.py
+++ b/tests/TestSuite_metering_and_policing.py
@@ -149,17 +149,16 @@ class TestMeteringAndPolicing(TestCase):
"""
if len(self.dut_ports) == 2:
portmask = "0x4"
- Corelist = "0x7"
+ Corelist = [0, 1, 2]
Servicecorelist = "0x4"
if len(self.dut_ports) == 4:
portmask = "0x10"
- Corelist = "0x1f"
+ Corelist = [0, 1, 2, 3, 4]
Servicecorelist = "0x10"
self.path = self.dut.apps_name['test-pmd']
- cmd = self.path + " -c %s -s %s -n %d --vdev 'net_softnic0,firmware=%s' \
- -- -i --rxq=%d --txq=%d --portmask=%s --disable-rss" \
- % (Corelist, Servicecorelist, self.dut.get_memory_channels(), filename, self.port_id, self.port_id, portmask)
- self.dut.send_expect(cmd, "testpmd>", 60)
+ self.pmd_out.start_testpmd(Corelist, "--rxq=%d --txq=%d --portmask=%s --disable-rss"
+ % (self.port_id, self.port_id, portmask),
+ eal_param="-s %s --vdev 'net_softnic0,firmware=%s'" % (Servicecorelist, filename))
def add_port_meter_profile(self, profile_id, cbs=400, pbs=500):
"""
@@ -246,7 +245,6 @@ class TestMeteringAndPolicing(TestCase):
Send packet and check the stats. If expect_port == -1, the packet should be dropped.
"""
# check the ports are UP before sending packets
- self.pmd_out = PmdOutput(self.dut)
res = self.pmd_out.wait_link_status_up('all', 30)
self.verify(res is True, 'there have port link is down')
@@ -314,6 +312,7 @@ class TestMeteringAndPolicing(TestCase):
if len(self.dut_ports) == 4:
self.dut_p2_pci = self.dut.get_port_pci(self.dut_ports[2])
self.dut_p3_pci = self.dut.get_port_pci(self.dut_ports[3])
+ self.pmd_out = PmdOutput(self.dut)
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()
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 14/28] tests/TestSuite_multicast:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (12 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 13/28] tests/TestSuite_metering_and_policing:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 15/28] tests/TestSuite_multiprocess:Modify " Zhou Jun
` (15 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_multicast.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tests/TestSuite_multicast.py b/tests/TestSuite_multicast.py
index 6fcaee6f..3ff06477 100644
--- a/tests/TestSuite_multicast.py
+++ b/tests/TestSuite_multicast.py
@@ -127,11 +127,10 @@ class TestMulticast(TestCase):
"""
IP4 Multicast Forwarding F1~F6
"""
- cores = self.dut.get_core_list("1S/2C/1T")
- coremask = utils.create_mask(cores)
+ eal_para = self.dut.create_eal_parameters(cores="1S/2C/1T")
payload = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
self.dut.send_expect("%s -c %s -n 4 -- -p %s -q 2" % (self.app_ipv4_multicast_path,
- coremask, '0x5'), "IPv4_MULTICAST:", 60)
+ eal_para, '0x5'), "IPv4_MULTICAST:", 60)
for flow in list(trafficFlow.keys()):
for tx_port in trafficFlow[flow][0].split(","):
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 15/28] tests/TestSuite_multiprocess:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (13 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 14/28] tests/TestSuite_multicast:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 16/28] tests/TestSuite_packet_ordering:Modify " Zhou Jun
` (14 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_multiprocess.py | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/tests/TestSuite_multiprocess.py b/tests/TestSuite_multiprocess.py
index d38123ad..743ca1f3 100644
--- a/tests/TestSuite_multiprocess.py
+++ b/tests/TestSuite_multiprocess.py
@@ -87,6 +87,7 @@ class TestMultiprocess(TestCase):
for i in self.dut_ports:
self.eal_param += " -w %s" % self.dut.ports_info[i]['pci']
+ self.eal_para = self.dut.create_eal_parameters(cores='1S/2C/1T')
# start new session to run secondary
self.session_secondary = self.dut.new_session()
@@ -113,12 +114,12 @@ class TestMultiprocess(TestCase):
# Send message from secondary to primary
cores = self.dut.get_core_list('1S/2C/1T', socket=self.socket)
coremask = utils.create_mask(cores)
- self.dut.send_expect(self.app_simple_mp + " -n 1 -c %s --proc-type=primary" % (coremask),
+ self.dut.send_expect(self.app_simple_mp + " %s --proc-type=primary" % (self.eal_para),
"Finished Process Init", 100)
time.sleep(20)
coremask = hex(int(coremask, 16) * 0x10).rstrip("L")
self.session_secondary.send_expect(
- self.app_simple_mp + " -n 1 -c %s --proc-type=secondary" % (coremask), "Finished Process Init",
+ self.app_simple_mp + " %s --proc-type=secondary" % (self.eal_para), "Finished Process Init",
100)
self.session_secondary.send_expect("send hello_primary", ">")
@@ -130,10 +131,10 @@ class TestMultiprocess(TestCase):
cores = self.dut.get_core_list('1S/2C/1T', socket=self.socket)
coremask = utils.create_mask(cores)
self.session_secondary.send_expect(
- self.app_simple_mp + " -n 1 -c %s --proc-type=primary " % (coremask), "Finished Process Init", 100)
+ self.app_simple_mp + " %s --proc-type=primary " % (self.eal_para), "Finished Process Init", 100)
time.sleep(20)
coremask = hex(int(coremask, 16) * 0x10).rstrip("L")
- self.dut.send_expect(self.app_simple_mp + " -n 1 -c %s --proc-type=secondary" % (coremask),
+ self.dut.send_expect(self.app_simple_mp + " %s --proc-type=secondary" % (self.eal_para),
"Finished Process Init", 100)
self.session_secondary.send_expect("send hello_secondary", ">")
out = self.dut.get_session_output()
@@ -150,11 +151,11 @@ class TestMultiprocess(TestCase):
cores = self.dut.get_core_list('1S/2C/1T', socket=self.socket)
coremask = utils.create_mask(cores)
- self.session_secondary.send_expect(self.app_simple_mp + " -n 1 -c %s --proc-type=primary" % (coremask),
+ self.session_secondary.send_expect(self.app_simple_mp + " %s --proc-type=primary" % (self.eal_para),
"Finished Process Init", 100)
time.sleep(20)
coremask = hex(int(coremask, 16) * 0x10).rstrip("L")
- self.dut.send_expect(self.app_simple_mp + " -n 1 -c %s --proc-type=secondary" % (coremask),
+ self.dut.send_expect(self.app_simple_mp + " %s --proc-type=secondary" % (self.eal_para),
"Finished Process Init", 100)
stringsSent = 0
for line in open('/usr/share/dict/words', 'r').readlines():
@@ -176,13 +177,13 @@ class TestMultiprocess(TestCase):
# Send message from secondary to primary (auto process type)
cores = self.dut.get_core_list('1S/2C/1T', socket=self.socket)
coremask = utils.create_mask(cores)
- out = self.dut.send_expect(self.app_simple_mp + " -n 1 -c %s --proc-type=auto " % (coremask),
+ out = self.dut.send_expect(self.app_simple_mp + " %s --proc-type=auto " % (self.eal_para),
"Finished Process Init", 100)
self.verify("EAL: Auto-detected process type: PRIMARY" in out, "The type of process (PRIMARY) was not detected properly")
time.sleep(20)
coremask = hex(int(coremask, 16) * 0x10).rstrip("L")
out = self.session_secondary.send_expect(
- self.app_simple_mp + " -n 1 -c %s --proc-type=auto" % (coremask), "Finished Process Init", 100)
+ self.app_simple_mp + " %s --proc-type=auto" % (self.eal_para), "Finished Process Init", 100)
self.verify("EAL: Auto-detected process type: SECONDARY" in out,
"The type of process (SECONDARY) was not detected properly")
@@ -196,11 +197,11 @@ class TestMultiprocess(TestCase):
cores = self.dut.get_core_list('1S/2C/1T', socket=self.socket)
coremask = utils.create_mask(cores)
out = self.session_secondary.send_expect(
- self.app_simple_mp + " -n 1 -c %s --proc-type=auto" % (coremask), "Finished Process Init", 100)
+ self.app_simple_mp + " %s --proc-type=auto" % (self.eal_para), "Finished Process Init", 100)
self.verify("EAL: Auto-detected process type: PRIMARY" in out, "The type of process (PRIMARY) was not detected properly")
time.sleep(20)
coremask = hex(int(coremask, 16) * 0x10).rstrip("L")
- out = self.dut.send_expect(self.app_simple_mp + " -n 1 -c %s --proc-type=auto" % (coremask),
+ out = self.dut.send_expect(self.app_simple_mp + " %s --proc-type=auto" % (self.eal_para),
"Finished Process Init", 100)
self.verify("EAL: Auto-detected process type: SECONDARY" in out, "The type of process (SECONDARY) was not detected properly")
self.session_secondary.send_expect("send hello_secondary", ">", 100)
@@ -218,10 +219,10 @@ class TestMultiprocess(TestCase):
cores = self.dut.get_core_list('1S/2C/1T', socket=self.socket)
coremask = utils.create_mask(cores)
- self.session_secondary.send_expect(self.app_simple_mp + " -n 1 -c %s -m 64" % (coremask),
+ self.session_secondary.send_expect(self.app_simple_mp + " %s -m 64" % (self.eal_para),
"Finished Process Init", 100)
coremask = hex(int(coremask, 16) * 0x10).rstrip("L")
- out = self.dut.send_expect(self.app_simple_mp + " -n 1 -c %s" % (coremask), "# ", 100)
+ out = self.dut.send_expect(self.app_simple_mp + " %s" % (self.eal_para), "# ", 100)
self.verify("Is another primary process running" in out,
"No other primary process detected")
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 16/28] tests/TestSuite_packet_ordering:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (14 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 15/28] tests/TestSuite_multiprocess:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 17/28] tests/TestSuite_pmdpcap:Modify " Zhou Jun
` (13 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_packet_ordering.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_packet_ordering.py b/tests/TestSuite_packet_ordering.py
index 067e886c..807a3c0d 100644
--- a/tests/TestSuite_packet_ordering.py
+++ b/tests/TestSuite_packet_ordering.py
@@ -60,6 +60,7 @@ class TestPacketOrdering(TestCase):
# get socket and cores
self.socket = self.dut.get_numa_id(self.dut_ports[0])
self.cores = self.dut.get_core_list("1S/4C/1T", socket=self.socket)
+ self.eal_para = self.dut.create_eal_parameters(cores='1S/4C/1T')
self.verify(self.cores is not None, "Insufficient cores for speed testing")
self.core_mask = utils.create_mask(self.cores)
@@ -80,8 +81,8 @@ class TestPacketOrdering(TestCase):
def start_application(self):
app_name = self.dut.apps_name['packet_ordering']
- cmdline = app_name + '-c {0} -n {1} -- -p {2}'.\
- format(self.core_mask, self.dut.get_memory_channels(), self.port_mask)
+ cmdline = app_name + '{0} -- -p {1}'.\
+ format(self.eal_para, self.port_mask)
# Executes the packet ordering example app.
self.dut.send_expect(cmdline, 'REORDERAPP', 120)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 17/28] tests/TestSuite_pmdpcap:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (15 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 16/28] tests/TestSuite_packet_ordering:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 18/28] tests/TestSuite_pmdrss_hash:Modify " Zhou Jun
` (12 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_pmdpcap.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/TestSuite_pmdpcap.py b/tests/TestSuite_pmdpcap.py
index cec987ae..ed41082e 100644
--- a/tests/TestSuite_pmdpcap.py
+++ b/tests/TestSuite_pmdpcap.py
@@ -126,15 +126,15 @@ class TestPmdPcap(TestCase):
two_cores = self.dut.get_core_list("1S/2C/1T")
core_mask = utils.create_mask(two_cores)
+ eal_para = self.dut.create_eal_parameters(cores='1S/2C/1T')
self.create_pcap_file(in_pcap, TestPmdPcap.pcap_file_sizes[0])
self.dut.session.copy_file_to(in_pcap)
- command = ("{} -c {} -n {} " +
+ command = ("{} {} " +
"--vdev=eth_pcap0,rx_pcap={},tx_pcap={} " +
"-- -i --port-topology=chained --no-flush-rx")
- self.dut.send_expect(command.format(self.path, core_mask,
- self.memory_channel,
+ self.dut.send_expect(command.format(self.path, eal_para,
TestPmdPcap.dut_pcap_files_path + in_pcap,
out_pcap), 'testpmd> ', 15)
@@ -157,18 +157,18 @@ class TestPmdPcap(TestCase):
four_cores = self.dut.get_core_list("1S/4C/1T")
core_mask = utils.create_mask(four_cores)
+ eal_para = self.dut.create_eal_parameters(cores='1S/4C/1T')
self.create_pcap_file(in_pcap1, TestPmdPcap.pcap_file_sizes[0])
self.dut.session.copy_file_to(in_pcap1)
self.create_pcap_file(in_pcap2, TestPmdPcap.pcap_file_sizes[1])
self.dut.session.copy_file_to(in_pcap2)
- command = ("{} -c {} -n {} " +
+ command = ("{} {} " +
"--vdev=eth_pcap0,rx_pcap={},tx_pcap={} " +
"--vdev=eth_pcap1,rx_pcap={},tx_pcap={} " +
"-- -i --no-flush-rx")
- self.dut.send_expect(command.format(self.path, core_mask,
- self.memory_channel,
+ self.dut.send_expect(command.format(self.path, eal_para,
TestPmdPcap.dut_pcap_files_path +
in_pcap1,
out_pcap1,
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 18/28] tests/TestSuite_pmdrss_hash:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (16 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 17/28] tests/TestSuite_pmdpcap:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 19/28] tests/TestSuite_pmdrssreta:Modify " Zhou Jun
` (11 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
| 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
--git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py
index 7e6d0bf9..fb83f78d 100644
--- a/tests/TestSuite_pmdrss_hash.py
+++ b/tests/TestSuite_pmdrss_hash.py
@@ -449,6 +449,7 @@ class TestPmdrssHash(TestCase):
Run before each test case.
"""
cores = self.dut.get_core_list("all")
+ self.eal_para = self.dut.create_eal_parameters(cores=cores)
self.coremask = utils.create_mask(cores)
def test_toeplitz(self):
@@ -462,8 +463,8 @@ class TestPmdrssHash(TestCase):
# test with different rss queues
self.dut.send_expect(
- "%s -c %s -n %d -- -i --rxq=%d --txq=%d" %
- (self.path, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+ "%s %s -- -i --rxq=%d --txq=%d" %
+ (self.path, self.eal_para, queue, queue), "testpmd> ", 120)
for iptype, rsstype in list(iptypes.items()):
self.dut.send_expect("set verbose 8", "testpmd> ")
@@ -500,8 +501,8 @@ class TestPmdrssHash(TestCase):
# test with different rss queues
self.dut.send_expect(
- "%s -c %s -n %d -- -i --rxq=%d --txq=%d" %
- (self.path, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+ "%s %s -- -i --rxq=%d --txq=%d" %
+ (self.path, self.eal_para, queue, queue), "testpmd> ", 120)
for iptype, rsstype in list(iptypes.items()):
self.dut.send_expect("set verbose 8", "testpmd> ")
@@ -545,8 +546,8 @@ class TestPmdrssHash(TestCase):
# test with different rss queues
self.dut.send_expect(
- "%s -c %s -n %d -- -i --rxq=%d --txq=%d" %
- (self.path, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+ "%s %s -- -i --rxq=%d --txq=%d" %
+ (self.path, self.eal_para, queue, queue), "testpmd> ", 120)
for iptype, rsstype in list(iptypes.items()):
self.logger.info("***********************%s rss test********************************" % iptype)
@@ -585,8 +586,8 @@ class TestPmdrssHash(TestCase):
# test with different rss queues
self.dut.send_expect(
- "%s -c %s -n %d -- -i --rxq=%d --txq=%d" %
- (self.path, self.coremask, self.dut.get_memory_channels(), queue, queue), "testpmd> ", 120)
+ "%s %s -- -i --rxq=%d --txq=%d" %
+ (self.path, self.eal_para, queue, queue), "testpmd> ", 120)
for iptype, rsstype in list(iptypes.items()):
self.dut.send_expect("set verbose 8", "testpmd> ")
@@ -621,7 +622,7 @@ class TestPmdrssHash(TestCase):
"fortpark_TLV","fortpark_BASE-T", "fortville_25g", "carlsville", "foxville"],
"NIC Unsupported: " + str(self.nic))
- self.dut.send_expect("%s -c %s -n %d -- -i" % (self.path, self.coremask, self.dut.get_memory_channels()), "testpmd> ", 120)
+ self.dut.send_expect("%s %s -- -i" % (self.path, self.eal_para), "testpmd> ", 120)
self.dut.send_expect("set promisc all off", "testpmd> ")
out = self.dut.send_expect("create bonded device 3 0", "testpmd> ", 30)
bond_device_id = int(re.search("port \d+", out).group().split(" ")[-1].strip())
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 19/28] tests/TestSuite_pmdrssreta:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (17 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 18/28] tests/TestSuite_pmdrss_hash:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 20/28] tests/TestSuite_ptpclient:Modify " Zhou Jun
` (10 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
| 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py
index 4f7c7915..25c8074f 100644
--- a/tests/TestSuite_pmdrssreta.py
+++ b/tests/TestSuite_pmdrssreta.py
@@ -269,8 +269,7 @@ class TestPmdrssreta(TestCase):
localPort = self.tester.get_local_port(dutPorts[0])
itf = self.tester.get_interface(localPort)
self.dut.kill_all()
- cmd = self.dut.apps_name['test-pmd'] + "-c %s -n %d -- -i --rxq=2 --txq=2" % (self.coremask, self.dut.get_memory_channels())
- self.dut.send_expect(cmd, "testpmd> ", 120)
+ self.pmdout.start_testpmd("all", "--rxq=2 --txq=2")
self.dut.send_expect("start", "testpmd> ", 120)
out = self.dut.send_expect("show port info all", "testpmd> ", 120)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 20/28] tests/TestSuite_ptpclient:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (18 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 19/28] tests/TestSuite_pmdrssreta:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 21/28] tests/TestSuite_queue_start_stop:Modify " Zhou Jun
` (9 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_ptpclient.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_ptpclient.py b/tests/TestSuite_ptpclient.py
index 07bfde68..858d5f46 100644
--- a/tests/TestSuite_ptpclient.py
+++ b/tests/TestSuite_ptpclient.py
@@ -64,6 +64,7 @@ class TestPtpClient(TestCase):
self.app_name = self.app_ptpclient_path[self.app_ptpclient_path.rfind('/')+1:]
port = self.tester.get_local_port(dutPorts[0])
self.itf0 = self.tester.get_interface(port)
+ self.eal_para = self.dut.create_eal_parameters()
def set_up(self):
"""
@@ -99,7 +100,7 @@ class TestPtpClient(TestCase):
self.tester.send_expect("ptp4l -i %s -2 -m -S &" % self.itf0, "ptp4l")
# run ptpclient on the background
- self.dut.send_expect("./%s -c f -n 3 -- -T 0 -p 0x1 " % self.app_ptpclient_path + "&",
+ self.dut.send_expect("./%s %s -- -T 0 -p 0x1 " % (self.app_ptpclient_path, self.eal_para) + "&",
"Delta between master and slave", 60)
time.sleep(3)
out = self.dut.get_session_output()
@@ -130,7 +131,7 @@ class TestPtpClient(TestCase):
self.tester.send_expect("ptp4l -i %s -2 -m -S &" % self.itf0, "ptp4l")
# run ptpclient on the background
- self.dut.send_expect("./%s -c f -n 3 -- -T 1 -p 0x1" % self.app_ptpclient_path + "&",
+ self.dut.send_expect("./%s %s -- -T 1 -p 0x1" % (self.app_ptpclient_path, self.eal_para) + "&",
"Delta between master and slave", 60)
time.sleep(3)
out = self.dut.get_session_output()
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 21/28] tests/TestSuite_queue_start_stop:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (19 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 20/28] tests/TestSuite_ptpclient:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 22/28] tests/TestSuite_rxtx_callbacks:Modify " Zhou Jun
` (8 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_queue_start_stop.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/TestSuite_queue_start_stop.py b/tests/TestSuite_queue_start_stop.py
index 77b25607..75718c8c 100644
--- a/tests/TestSuite_queue_start_stop.py
+++ b/tests/TestSuite_queue_start_stop.py
@@ -130,8 +130,9 @@ class TestQueueStartStop(TestCase):
queue start/stop test
"""
#dpdk start
+ eal_para = self.dut.create_eal_parameters()
try:
- self.dut.send_expect("%s -c 0xf -n 4 -- -i --portmask=0x1 --port-topology=loop" % self.app_testpmd_path, "testpmd>", 120)
+ self.dut.send_expect("%s %s -- -i --portmask=0x1 --port-topology=loop" % (self.app_testpmd_path, eal_para), "testpmd>", 120)
time.sleep(5)
self.dut.send_expect("set fwd mac", "testpmd>")
self.dut.send_expect("start", "testpmd>")
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 22/28] tests/TestSuite_rxtx_callbacks:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (20 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 21/28] tests/TestSuite_queue_start_stop:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 23/28] tests/TestSuite_short_live:Modify " Zhou Jun
` (7 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_rxtx_callbacks.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/TestSuite_rxtx_callbacks.py b/tests/TestSuite_rxtx_callbacks.py
index 33a1bb00..f7d343eb 100644
--- a/tests/TestSuite_rxtx_callbacks.py
+++ b/tests/TestSuite_rxtx_callbacks.py
@@ -67,7 +67,8 @@ class TestRxtxCallbacks(TestCase):
pass
def test_rxtx_callbacks(self):
- cmd = self.app_rxtx_callbacks_path + " -c %s -n %d " % (self.coremask,self.dut.get_memory_channels())
+ eal_para = self.dut.create_eal_parameters(cores='1S/2C/1T')
+ cmd = self.app_rxtx_callbacks_path + " %s" % eal_para
self.dut.send_expect(cmd,"forwarding packets",60)
self.iface_port0 = self.tester.get_interface(self.tester.get_local_port(self.dut_ports[0]))
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 23/28] tests/TestSuite_short_live:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (21 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 22/28] tests/TestSuite_rxtx_callbacks:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 24/28] tests/TestSuite_skeleton:Modify " Zhou Jun
` (6 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_short_live.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tests/TestSuite_short_live.py b/tests/TestSuite_short_live.py
index 88fc3bf2..525be9d3 100644
--- a/tests/TestSuite_short_live.py
+++ b/tests/TestSuite_short_live.py
@@ -67,6 +67,7 @@ class TestShortLiveApp(TestCase):
self.app_l2fwd_path = self.dut.apps_name['l2fwd']
self.app_l3fwd_path = self.dut.apps_name['l3fwd']
self.app_testpmd = self.dut.apps_name['test-pmd']
+ self.eal_para = self.dut.create_eal_parameters()
def set_up(self):
"""
@@ -141,7 +142,7 @@ class TestShortLiveApp(TestCase):
Basic rx/tx forwarding test
"""
#dpdk start
- self.dut.send_expect("./%s -c 0xf -n 4 -- -i --portmask=0x3" % self.app_testpmd, "testpmd>", 120)
+ self.dut.send_expect("./%s %s -- -i --portmask=0x3" % (self.app_testpmd, self.eal_para), "testpmd>", 120)
time.sleep(5)
self.dut.send_expect("set fwd mac", "testpmd>")
self.dut.send_expect("set promisc all off", "testpmd>")
@@ -160,7 +161,8 @@ class TestShortLiveApp(TestCase):
"""
time = []
regex = re.compile(".* (\d+:\d{2}\.\d{2}).*")
- out = self.dut.send_expect("echo quit | time ./%s -c 0x3 -n 4 --no-pci -- -i" % self.app_testpmd, "#", 120)
+ eal_para = self.dut.create_eal_parameters(no_pci=True)
+ out = self.dut.send_expect("echo quit | time ./%s %s -- -i" % (self.app_testpmd, eal_para), "#", 120)
time = regex.findall(out)
if time != []:
@@ -173,7 +175,7 @@ class TestShortLiveApp(TestCase):
for i in range(repeat_time):
#dpdk start
print("clean_up_with_signal_testpmd round %d" % (i + 1))
- self.dut.send_expect("./%s -c 0xf -n 4 -- -i --portmask=0x3" % self.app_testpmd, "testpmd>", 120)
+ self.dut.send_expect("./%s %s -- -i --portmask=0x3" % (self.app_testpmd, self.eal_para), "testpmd>", 120)
self.dut.send_expect("set fwd mac", "testpmd>")
self.dut.send_expect("set promisc all off", "testpmd>")
self.dut.send_expect("start", "testpmd>")
@@ -198,7 +200,7 @@ class TestShortLiveApp(TestCase):
for i in range(repeat_time):
#dpdk start
print("clean_up_with_signal_l2fwd round %d" % (i + 1))
- self.dut.send_expect("%s -n 4 -c 0xf -- -p 0x3 &" % self.app_l2fwd_path, "L2FWD: entering main loop", 60)
+ self.dut.send_expect("%s %s -- -p 0x3 &" % (self.app_l2fwd_path, self.eal_para), "L2FWD: entering main loop", 60)
self.check_forwarding([0, 1], self.nic)
# kill with different Signal
@@ -214,7 +216,7 @@ class TestShortLiveApp(TestCase):
for i in range(repeat_time):
#dpdk start
print("clean_up_with_signal_l3fwd round %d" % (i + 1))
- self.dut.send_expect("%s -n 4 -c 0xf -- -p 0x3 --config='(0,0,1),(1,0,2)' &" % self.app_l3fwd_path, "L3FWD: entering main loop", 120)
+ self.dut.send_expect("%s %s -- -p 0x3 --config='(0,0,1),(1,0,2)' &" % (self.app_l3fwd_path, self.eal_para), "L3FWD: entering main loop", 120)
self.check_forwarding([0, 0], self.nic)
# kill with different Signal
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 24/28] tests/TestSuite_skeleton:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (22 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 23/28] tests/TestSuite_short_live:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 25/28] tests/TestSuite_softnic:Modify " Zhou Jun
` (5 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_skeleton.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/TestSuite_skeleton.py b/tests/TestSuite_skeleton.py
index 7ae19f68..7ddc90a0 100644
--- a/tests/TestSuite_skeleton.py
+++ b/tests/TestSuite_skeleton.py
@@ -68,7 +68,8 @@ class TestSkeleton(TestCase):
pass
def test_skeleton(self):
- cmd = self.path + " -c %s -n %d " % (self.coremask,self.dut.get_memory_channels())
+ eal_para = self.dut.create_eal_parameters(cores='1S/2C/1T')
+ cmd = self.path + " -c %s -n %d " % eal_para
self.dut.send_expect(cmd,"forwarding packets",60)
time.sleep(5)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 25/28] tests/TestSuite_softnic:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (23 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 24/28] tests/TestSuite_skeleton:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 26/28] tests/TestSuite_timer:Modify " Zhou Jun
` (4 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_softnic.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/tests/TestSuite_softnic.py b/tests/TestSuite_softnic.py
index d0fb419c..0795b45c 100644
--- a/tests/TestSuite_softnic.py
+++ b/tests/TestSuite_softnic.py
@@ -77,7 +77,7 @@ class TestSoftnic(TestCase):
self.dut.session.copy_file_to(self.nat_firmware, self.root_path)
self.eal_param = " -w %s" % self.dut.ports_info[0]['pci']
self.path = self.dut.apps_name['test-pmd']
- self.cmd = "./%s -c 0x7 -s 0x4 -n 4 %s --vdev 'net_softnic0,firmware=/tmp/%s,cpu_id=1,conn_port=8086' -- -i --forward-mode=softnic --portmask=0x2"
+ self.pmdout = PmdOutput(self.dut)
# get dts output path
if self.logger.log_path.startswith(os.sep):
self.output_path = self.logger.log_path
@@ -103,7 +103,9 @@ class TestSoftnic(TestCase):
# 10G nic pps(M)
expect_pps = [14, 8, 4, 2, 1, 0.9, 0.8]
- self.dut.send_expect(self.cmd % (self.path, self.eal_param, 'firmware.cli'), "testpmd>", timeout=800)
+ self.pmdout.start_testpmd(list(range(3)), "--forward-mode=softnic --portmask=0x2",
+ eal_param="-s 0x4 %s --vdev 'net_softnic0,firmware=/tmp/%s,cpu_id=1,conn_port=8086'"
+ % (self.eal_param, 'firmware.cli'))
self.dut.send_expect("start", "testpmd>")
rx_port = self.tester.get_local_port(0)
tx_port = self.tester.get_local_port(0)
@@ -128,7 +130,9 @@ class TestSoftnic(TestCase):
def test_perf_shaping_for_pipe(self):
self.change_config_file('tm_firmware.cli')
- self.dut.send_expect(self.cmd % (self.path, self.eal_param, 'tm_firmware.cli'), "testpmd> ", timeout=800)
+ self.pmdout.start_testpmd(list(range(3)), "--forward-mode=softnic --portmask=0x2",
+ eal_param="-s 0x4 %s --vdev 'net_softnic0,firmware=/tmp/%s,cpu_id=1,conn_port=8086'"
+ % (self.eal_param, 'tm_firmware.cli'))
self.dut.send_expect("start", "testpmd>")
rx_port = self.tester.get_local_port(0)
pkts = ["Ether(dst='%s')/IP(dst='100.0.0.0')/UDP()/Raw(load='x'*(64 - %s))", "Ether(dst='%s')/IP(dst='100.0.15.255')/UDP()/Raw(load='x'*(64 - %s))", "Ether(dst='%s')/IP(dst='100.0.4.0')/UDP()/Raw(load='x'*(64 - %s))"]
@@ -167,7 +171,9 @@ class TestSoftnic(TestCase):
for t in pkt_type:
for i in range(2):
self.dut.send_expect("sed -i -e '12c table action profile AP0 ipv4 offset 270 fwd nat %s proto %s' %s" % (pkt_location[i], t, self.root_path + 'nat_firmware.cli'), "#")
- self.dut.send_expect(self.cmd % (self.path, self.eal_param, 'nat_firmware.cli'), "testpmd>", timeout=60)
+ self.pmdout.start_testpmd(list(range(3)), "--forward-mode=softnic --portmask=0x2",
+ eal_param="-s 0x4 %s --vdev 'net_softnic0,firmware=/tmp/%s,cpu_id=1,conn_port=8086'" % (
+ self.eal_param, 'nat_firmware.cli'))
self.dut.send_expect("start", "testpmd>")
# src ip tcp
for j in range(2):
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 26/28] tests/TestSuite_timer:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (24 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 25/28] tests/TestSuite_softnic:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 27/28] tests/TestSuite_tso:Modify " Zhou Jun
` (3 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_timer.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_timer.py b/tests/TestSuite_timer.py
index 0be80293..77758823 100644
--- a/tests/TestSuite_timer.py
+++ b/tests/TestSuite_timer.py
@@ -69,10 +69,10 @@ class TestTimer(TestCase):
# get the mask for the first core
cores = self.dut.get_core_list('1S/1C/1T')
- coreMask = utils.create_mask(cores)
+ eal_para = self.dut.create_eal_parameters(cores='1S/1C/1T')
# run timer on the background
- cmdline = "./%s -n 1 -c " % self.app_timer_path + coreMask + " &"
+ cmdline = "./%s %s " % (self.app_timer_path, eal_para) + " &"
self.dut.send_expect(cmdline, "# ", 1)
time.sleep(15)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 27/28] tests/TestSuite_tso:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (25 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 26/28] tests/TestSuite_timer:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-08 10:06 ` [dts] [dts 28/28] tests/TestSuite_userspace_ethtool:Modify " Zhou Jun
` (2 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_tso.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py
index d0c67d47..e119b3fd 100644
--- a/tests/TestSuite_tso.py
+++ b/tests/TestSuite_tso.py
@@ -77,9 +77,7 @@ class TestTSO(TestCase):
self.table_header.append("%s Mpps" % test_cycle['cores'])
self.table_header.append("% linerate")
- self.eal_param = ""
- for i in self.dut_ports:
- self.eal_param += " -w %s" % self.dut.ports_info[i]['pci']
+ self.eal_param = self.dut.create_eal_parameters(cores='1S/1C/2T')
self.headers_size = HEADER_SIZE['eth'] + HEADER_SIZE[
'ip'] + HEADER_SIZE['tcp']
@@ -201,9 +199,9 @@ class TestTSO(TestCase):
self.tester.send_expect("ip l set %s up" % tx_interface, "# ")
if (self.nic in ["cavium_a063","cavium_a064"]):
- cmd = "%s -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 --tx-offloads=0x8000" % (self.path, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU)
+ cmd = "%s %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 --tx-offloads=0x8000" % (self.path, self.eal_param, self.portMask, TSO_MTU)
else:
- cmd = "%s -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.path, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU)
+ cmd = "%s %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.path, self.eal_param, self.portMask, TSO_MTU)
self.dut.send_expect(cmd, "testpmd> ", 120)
self.dut.send_expect("set verbose 1", "testpmd> ", 120)
@@ -298,7 +296,7 @@ class TestTSO(TestCase):
self.tester.send_expect("ethtool -K %s rx off tx off tso off gso off gro off lro off" % tx_interface, "# ")
self.tester.send_expect("ip l set %s up" % tx_interface, "# ")
- cmd = "%s -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.path, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU)
+ cmd = "%s %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.path, self.eal_param, self.portMask, TSO_MTU)
self.dut.send_expect(cmd, "testpmd> ", 120)
self.dut.send_expect("set verbose 1", "testpmd> ", 120)
self.dut.send_expect("port stop all", "testpmd> ", 120)
@@ -398,7 +396,7 @@ class TestTSO(TestCase):
else:
queues = 1
- command_line = "%s -c %s -n %d %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.path, self.coreMask, self.dut.get_memory_channels(), self.eal_param, self.portMask, TSO_MTU)
+ command_line = "%s %s -- -i --rxd=512 --txd=512 --burst=32 --rxfreet=64 --mbcache=128 --portmask=%s --max-pkt-len=%s --txpt=36 --txht=0 --txwt=0 --txfreet=32 --txrst=32 " % (self.path, self.eal_param, self.portMask, TSO_MTU)
info = "Executing PMD using %s\n" % test_cycle['cores']
self.logger.info(info)
self.rst_report(info, annex=True)
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [dts] [dts 28/28] tests/TestSuite_userspace_ethtool:Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (26 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 27/28] tests/TestSuite_tso:Modify " Zhou Jun
@ 2020-12-08 10:06 ` Zhou Jun
2020-12-09 1:53 ` [dts] [PATCH V1 00/28] Modify " Zhao, HaiyangX
2020-12-10 8:43 ` Tu, Lijuan
29 siblings, 0 replies; 31+ messages in thread
From: Zhou Jun @ 2020-12-08 10:06 UTC (permalink / raw)
To: dts; +Cc: Zhou Jun
Signed-off-by: Zhou Jun <junx.w.zhou@intel.com>
---
tests/TestSuite_userspace_ethtool.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py
index 68dace33..d73a7e16 100644
--- a/tests/TestSuite_userspace_ethtool.py
+++ b/tests/TestSuite_userspace_ethtool.py
@@ -68,8 +68,9 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
cpu_cores = self.dut.send_expect('lscpu |grep "NUMA node%s CPU(s):"' % out, "# ")
core = re.findall(r"\d+-(\d+)", cpu_cores)[0]
core = int(core)
- cores = "%d,%d,%d,%d" % (core - 1, core - 2, core - 3, core - 4)
- self.cmd = "%s -l %s -n %d" % (self.app_ethtool_path, cores, self.dut.get_memory_channels())
+ cores = [core - 1, core - 2, core - 3, core - 4]
+ eal_para = self.dut.create_eal_parameters(cores=cores)
+ self.cmd = "%s %s" % (self.app_ethtool_path, eal_para)
# pause frame basic configuration
self.pause_time = 65535
--
2.17.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (27 preceding siblings ...)
2020-12-08 10:06 ` [dts] [dts 28/28] tests/TestSuite_userspace_ethtool:Modify " Zhou Jun
@ 2020-12-09 1:53 ` Zhao, HaiyangX
2020-12-10 8:43 ` Tu, Lijuan
29 siblings, 0 replies; 31+ messages in thread
From: Zhao, HaiyangX @ 2020-12-09 1:53 UTC (permalink / raw)
To: Zhou, JunX W, dts; +Cc: Zhou, JunX W
Acked-by: Haiyang Zhao <haiyangx.zhao@intel.com>
Best Regards,
Zhao Haiyang
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Zhou Jun
> Sent: Tuesday, December 8, 2020 18:06
> To: dts@dpdk.org
> Cc: Zhou, JunX W <junx.w.zhou@intel.com>
> Subject: [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call
> the platform interface
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
` (28 preceding siblings ...)
2020-12-09 1:53 ` [dts] [PATCH V1 00/28] Modify " Zhao, HaiyangX
@ 2020-12-10 8:43 ` Tu, Lijuan
29 siblings, 0 replies; 31+ messages in thread
From: Tu, Lijuan @ 2020-12-10 8:43 UTC (permalink / raw)
To: Zhou, JunX W, dts; +Cc: Zhou, JunX W
>
> Modify the hard coded app parameter to call the platform interface
>
> Zhou Jun (28):
> tests/TestSuite_hello_world:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_hotplug:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_inline_ipsec:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_interrupt_pmd:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_ip_pipeline:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_ipfrag:Modify the hard coded app parameter to call the
> platform interface
> tests/TestSuite_ipv4_reassembly:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_keep_alive:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_kni:Modify the hard coded app parameter to call the
> platform interface
> tests/TestSuite_l2fwd_jobstats:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_l3fwdacl:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_link_status_interrupt:Modify the hard coded app
> parameter to call the platform interface
> tests/TestSuite_metering_and_policing:Modify the hard coded app
> parameter to call the platform interface
> tests/TestSuite_multicast:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_multiprocess:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_packet_ordering:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_pmdpcap:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_pmdrss_hash:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_pmdrssreta:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_ptpclient:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_queue_start_stop:Modify the hard coded app parameter
> to call the platform interface
> tests/TestSuite_rxtx_callbacks:Modify the hard coded app parameter to
> call the platform interface
> tests/TestSuite_short_live:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_skeleton:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_softnic:Modify the hard coded app parameter to call
> the platform interface
> tests/TestSuite_timer:Modify the hard coded app parameter to call the
> platform interface
> tests/TestSuite_tso:Modify the hard coded app parameter to call the
> platform interface
> tests/TestSuite_userspace_ethtool:Modify the hard coded app parameter
> to call the platform interface
Applied
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2020-12-10 8:44 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-08 10:05 [dts] [PATCH V1 00/28] Modify the hard coded app parameter to call the platform interface Zhou Jun
2020-12-08 10:06 ` [dts] [dts 01/28] tests/TestSuite_hello_world:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 02/28] tests/TestSuite_hotplug:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 03/28] tests/TestSuite_inline_ipsec:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 04/28] tests/TestSuite_interrupt_pmd:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 05/28] tests/TestSuite_ip_pipeline:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 06/28] tests/TestSuite_ipfrag:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 07/28] tests/TestSuite_ipv4_reassembly:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 08/28] tests/TestSuite_keep_alive:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 09/28] tests/TestSuite_kni:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 10/28] tests/TestSuite_l2fwd_jobstats:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 11/28] tests/TestSuite_l3fwdacl:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 12/28] tests/TestSuite_link_status_interrupt:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 13/28] tests/TestSuite_metering_and_policing:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 14/28] tests/TestSuite_multicast:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 15/28] tests/TestSuite_multiprocess:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 16/28] tests/TestSuite_packet_ordering:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 17/28] tests/TestSuite_pmdpcap:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 18/28] tests/TestSuite_pmdrss_hash:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 19/28] tests/TestSuite_pmdrssreta:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 20/28] tests/TestSuite_ptpclient:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 21/28] tests/TestSuite_queue_start_stop:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 22/28] tests/TestSuite_rxtx_callbacks:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 23/28] tests/TestSuite_short_live:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 24/28] tests/TestSuite_skeleton:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 25/28] tests/TestSuite_softnic:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 26/28] tests/TestSuite_timer:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 27/28] tests/TestSuite_tso:Modify " Zhou Jun
2020-12-08 10:06 ` [dts] [dts 28/28] tests/TestSuite_userspace_ethtool:Modify " Zhou Jun
2020-12-09 1:53 ` [dts] [PATCH V1 00/28] Modify " Zhao, HaiyangX
2020-12-10 8:43 ` Tu, Lijuan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).