From: Xie wei <weix.xie@intel.com>
To: dts@dpdk.org
Cc: Xie wei <weix.xie@intel.com>
Subject: [dts] [dts 8/8] tests/TestSuite_floating_veb:support meson build method
Date: Wed, 2 Sep 2020 17:15:10 +0800 [thread overview]
Message-ID: <20200902091510.6043-9-weix.xie@intel.com> (raw)
In-Reply-To: <20200902091510.6043-1-weix.xie@intel.com>
Signed-off-by: Xie wei <weix.xie@intel.com>
---
tests/TestSuite_floating_veb.py | 56 ++++++++++++++++++---------------
1 file changed, 31 insertions(+), 25 deletions(-)
diff --git a/tests/TestSuite_floating_veb.py b/tests/TestSuite_floating_veb.py
index bf83cb5..f4d62de 100644
--- a/tests/TestSuite_floating_veb.py
+++ b/tests/TestSuite_floating_veb.py
@@ -141,6 +141,9 @@ class TestFloatingVEBSwitching(TestCase):
self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
self.session_secondary = self.dut.new_session()
self.session_third = self.dut.new_session()
+ self.pmdout = PmdOutput(self.dut)
+ self.pmdout_2 = PmdOutput(self.dut, self.session_secondary)
+ self.pmdout_3 = PmdOutput(self.dut, self.session_third)
self.setup_1pf_ddriver_1vf_env_flag = 0
self.setup_1pf_ddriver_2vf_env_flag = 0
@@ -156,6 +159,7 @@ class TestFloatingVEBSwitching(TestCase):
self.pf_interface = self.dut.ports_info[self.used_dut_port]['intf']
self.pf_mac_address = self.dut.get_mac_address(0)
self.pf_pci = self.dut.ports_info[self.used_dut_port]['pci']
+ self.path = self.dut.apps_name['test-pmd']
def set_up(self):
"""
@@ -212,12 +216,12 @@ class TestFloatingVEBSwitching(TestCase):
"""
# VF->PF
self.setup_env(driver=self.drivername, vf_num=1)
- self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+ self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"})
self.dut.send_expect("set fwd rxonly", "testpmd>")
self.dut.send_expect("set promisc all off", "testpmd>")
self.dut.send_expect("start", "testpmd>")
time.sleep(2)
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.pf_mac_address), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.pf_mac_address)
self.session_secondary.send_expect("set fwd txonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
self.session_secondary.send_expect("start", "testpmd>")
@@ -236,11 +240,11 @@ class TestFloatingVEBSwitching(TestCase):
time.sleep(2)
#PF->VF
- self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.pf_pci, self.vf0_mac), "testpmd>", 120)
+ self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"}, param="--eth-peer=0,%s" % self.vf0_mac)
self.dut.send_expect("set fwd txonly", "testpmd>")
self.dut.send_expect("set promisc all off", "testpmd>")
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
@@ -265,13 +269,13 @@ class TestFloatingVEBSwitching(TestCase):
"""
#outside world ->VF
self.setup_env(driver=self.drivername, vf_num=1)
- self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.pf_pci, self.vf0_mac), "testpmd>", 120)
+ self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"}, param="--eth-peer=0,%s" % self.vf0_mac)
self.dut.send_expect("set fwd mac", "testpmd>")
self.dut.send_expect("set promisc all on", "testpmd>")
self.dut.send_expect("start", "testpmd>")
time.sleep(2)
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
self.session_secondary.send_expect("set fwd mac", "testpmd>")
self.session_secondary.send_expect("set promisc all on", "testpmd>")
@@ -296,18 +300,18 @@ class TestFloatingVEBSwitching(TestCase):
# PF link up, VF0->VF1
self.setup_env(driver=self.drivername, vf_num=2)
# start PF
- self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+ self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"})
self.dut.send_expect("port start all", "testpmd>")
time.sleep(2)
# start VF0
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
self.session_secondary.send_expect("start", "testpmd>")
time.sleep(2)
# start VF1
- self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[1].pci, self.vf0_mac), "testpmd>", 120)
+ self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[1].pci], param="--eth-peer=0,%s" % self.vf0_mac)
self.session_third.send_expect("set fwd txonly", "testpmd>")
self.session_third.send_expect("set promisc all off", "testpmd>")
self.session_third.send_expect("start", "testpmd>")
@@ -357,17 +361,18 @@ class TestFloatingVEBSwitching(TestCase):
"""
self.setup_env(driver=self.drivername, vf_num=4)
# start PF
- self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;2-3\" --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+ cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;2-3\" --file-prefix=test1 -- -i" % self.pf_pci
+ self.dut.send_expect(cmd, "testpmd> ", 120)
self.dut.send_expect("port start all", "testpmd>")
time.sleep(2)
# VF1->VF0
# start VF0
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac)
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
# start VF1
- self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[1].pci, self.vf0_mac), "testpmd>", 120)
+ self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[1].pci], param="--eth-peer=0,%s" % self.vf0_mac)
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>")
self.session_third.send_expect("set fwd txonly", "testpmd>")
self.session_third.send_expect("set promisc all off", "testpmd>")
@@ -410,12 +415,12 @@ class TestFloatingVEBSwitching(TestCase):
# VF0->VF2
# start VF0
self.dut.send_expect("port start all", "testpmd>")
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf2_mac), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf2_mac)
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
self.session_secondary.send_expect("set fwd txonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
# start VF2
- self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i" % (self.target, self.sriov_vfs_port[2].pci), "testpmd>", 120)
+ self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci])
self.session_third.send_expect("mac_addr add 0 %s" % self.vf2_mac, "testpmd>")
self.session_third.send_expect("set fwd rxonly", "testpmd>")
self.session_third.send_expect("set promisc all off", "testpmd>")
@@ -444,12 +449,12 @@ class TestFloatingVEBSwitching(TestCase):
# VF3->VF2
# start VF3
self.dut.send_expect("port start all", "testpmd>")
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[3].pci, self.vf2_mac), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[3].pci], param="--eth-peer=0,%s" % self.vf2_mac)
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
self.session_secondary.send_expect("set fwd txonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
# start VF2
- self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i" % (self.target, self.sriov_vfs_port[2].pci), "testpmd>", 120)
+ self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci])
self.session_third.send_expect("mac_addr add 0 %s" % self.vf2_mac, "testpmd>")
self.session_third.send_expect("set fwd rxonly", "testpmd>")
self.session_third.send_expect("set promisc all off", "testpmd>")
@@ -486,12 +491,13 @@ class TestFloatingVEBSwitching(TestCase):
"""
self.setup_env(driver=self.drivername, vf_num=4)
# VF0->PF
- self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;3\" --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+ cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;3\" --file-prefix=test1 -- -i" % self.pf_pci
+ self.dut.send_expect(cmd, "testpmd> ", 120)
self.dut.send_expect("set fwd rxonly", "testpmd>")
self.dut.send_expect("set promisc all off", "testpmd>")
self.dut.send_expect("start", "testpmd>")
time.sleep(2)
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.pf_mac_address), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.pf_mac_address)
self.session_secondary.send_expect("set fwd txonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
self.session_secondary.send_expect("start", "testpmd>")
@@ -508,7 +514,7 @@ class TestFloatingVEBSwitching(TestCase):
time.sleep(2)
# VF1->PF
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[1].pci, self.pf_mac_address), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci], param="--eth-peer=0,%s" % self.pf_mac_address)
self.session_secondary.send_expect("set fwd txonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
self.dut.send_expect("start", "testpmd>")
@@ -533,7 +539,7 @@ class TestFloatingVEBSwitching(TestCase):
self.dut.send_expect("start", "testpmd>")
time.sleep(2)
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
@@ -551,7 +557,7 @@ class TestFloatingVEBSwitching(TestCase):
time.sleep(2)
# tester->VF1
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>")
self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
@@ -569,14 +575,14 @@ class TestFloatingVEBSwitching(TestCase):
time.sleep(2)
# VF2->VF1
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>")
self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
self.session_secondary.send_expect("start", "testpmd>")
time.sleep(2)
- self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[2].pci, self.vf1_mac), "testpmd>", 120)
+ self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci], param="--eth-peer=0,%s" % self.vf1_mac)
self.session_third.send_expect("set fwd txonly", "testpmd>")
self.session_third.send_expect("set promisc all off", "testpmd>")
self.session_third.send_expect("start", "testpmd>")
@@ -596,12 +602,12 @@ class TestFloatingVEBSwitching(TestCase):
time.sleep(2)
# PF link down, VF2->VF1
- self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+ self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>")
self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
self.session_secondary.send_expect("set promisc all off", "testpmd>")
- self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[2].pci, self.vf1_mac), "testpmd>", 120)
+ self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci], param="--eth-peer=0,%s" % self.vf1_mac)
self.session_third.send_expect("set fwd txonly", "testpmd>")
self.session_third.send_expect("set promisc all off", "testpmd>")
--
2.17.1
next prev parent reply other threads:[~2020-09-02 9:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 9:15 [dts] [PATCH V1 0/8] support " Xie wei
2020-09-02 9:15 ` [dts] [dts 1/8] tests/TestSuite_flow_filtering:support " Xie wei
2020-09-02 9:15 ` [dts] [dts 2/8] tests/TestSuite_port_control:support " Xie wei
2020-09-02 9:15 ` [dts] [dts 3/8] tests/TestSuite_runtime_vf_queue_number:support " Xie wei
2020-09-02 9:15 ` [dts] [dts 4/8] tests/TestSuite_runtime_vf_queue_number_kernel:support " Xie wei
2020-09-02 9:15 ` [dts] [dts 5/8] tests/TestSuite_veb_switch:support " Xie wei
2020-09-02 9:15 ` [dts] [dts 6/8] tests/TestSuite_vf_interrupt_pmd:support " Xie wei
2020-09-02 9:15 ` [dts] [dts 7/8] tests/TestSuite_vm_power_manager:support " Xie wei
2020-09-02 9:15 ` Xie wei [this message]
2020-09-02 9:30 ` [dts] [PATCH V1 0/8] support " Xie, WeiX
2020-09-04 6:07 ` Ma, LihongX
2020-09-09 8:27 ` Tu, Lijuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200902091510.6043-9-weix.xie@intel.com \
--to=weix.xie@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).