* [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path
@ 2019-09-04 6:55 zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 2/8] tests/pvp_virtio_bonding:vhost-net " zhuwenhui
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: zhuwenhui @ 2019-09-04 6:55 UTC (permalink / raw)
To: dts; +Cc: zhuwenhui
Vhost-net changed to absolute path.
Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
tests/TestSuite_virtio_pvp_regression.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/TestSuite_virtio_pvp_regression.py b/tests/TestSuite_virtio_pvp_regression.py
index 902ac09..84bf8c2 100644
--- a/tests/TestSuite_virtio_pvp_regression.py
+++ b/tests/TestSuite_virtio_pvp_regression.py
@@ -91,13 +91,14 @@ class TestVirtioPVPRegression(TestCase):
self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
# create an instance to set stream field setting
self.pktgen_helper = PacketGeneratorHelper()
+ self.base_dir = self.dut.base_dir.replace('~', '/root')
def set_up(self):
"""
Run before each test case.
"""
self.vhost = self.dut.new_session(suite="vhost-user")
- self.dut.send_expect("rm -rf ./vhost-net*", "#")
+ self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
def packet_params_set(self):
self.frame_sizes = [64, 1518]
@@ -205,7 +206,7 @@ class TestVirtioPVPRegression(TestCase):
self.vm = VM(self.dut, 'vm0', self.suite_name)
vm_params = {}
vm_params['driver'] = 'vhost-user'
- vm_params['opt_path'] = './vhost-net'
+ vm_params['opt_path'] = '%s/vhost-net' % self.base_dir
vm_params['opt_mac'] = self.virtio1_mac
vm_params['opt_server'] = 'server'
vm_params['opt_queue'] = self.queues_number
@@ -249,11 +250,11 @@ class TestVirtioPVPRegression(TestCase):
"""
command_line_client = self.dut.target + "/app/testpmd -n %d -c %s \
--socket-mem %s --file-prefix=vhost -w %s \
- --vdev 'eth_vhost0,iface=vhost-net,queues=%d,client=1' -- \
+ --vdev 'eth_vhost0,iface=%s/vhost-net,queues=%d,client=1' -- \
-i --nb-cores=%d --rxq=%d --txq=%d --txd=1024 --rxd=1024"
command_line_client = command_line_client % (
self.memory_channel, self.coremask, self.socket_mem,
- self.dut.ports_info[self.pf]['pci'],
+ self.dut.ports_info[self.pf]['pci'], self.base_dir,
self.queues_number, self.queues_number, self.queues_number,
self.queues_number)
self.vhost.send_expect(command_line_client, "testpmd> ", 30)
@@ -346,7 +347,7 @@ class TestVirtioPVPRegression(TestCase):
self.vm.stop()
self.dut.send_expect("killall -I testpmd", '#', 20)
self.dut.send_expect('killall -s INT qemu-system-x86_64', '# ')
- self.dut.send_expect("rm -rf ./vhost-net*", "#")
+ self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
def pvp_regression_run(self, case_info, modem, virtio_path):
"""
--
2.17.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dts] [PATCH V1 2/8] tests/pvp_virtio_bonding:vhost-net changed to absolute path
2019-09-04 6:55 [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path zhuwenhui
@ 2019-09-04 6:55 ` zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 3/8] tests/pvp_vhost_user_reconnect:vhost-net " zhuwenhui
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: zhuwenhui @ 2019-09-04 6:55 UTC (permalink / raw)
To: dts; +Cc: zhuwenhui
Vhost-net changed to absolute path.
Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
tests/TestSuite_pvp_virtio_bonding.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_pvp_virtio_bonding.py b/tests/TestSuite_pvp_virtio_bonding.py
index bcfbfd4..4fb94f2 100644
--- a/tests/TestSuite_pvp_virtio_bonding.py
+++ b/tests/TestSuite_pvp_virtio_bonding.py
@@ -69,6 +69,7 @@ class TestPVPVirtIOBonding(TestCase):
self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
# create an instance to set stream field setting
self.pktgen_helper = PacketGeneratorHelper()
+ self.base_dir = self.dut.base_dir.replace('~', '/root')
def set_up(self):
"""
@@ -86,7 +87,7 @@ class TestPVPVirtIOBonding(TestCase):
"""
vdev_info = ""
for i in range(self.queues):
- vdev_info += "--vdev 'net_vhost%d,iface=vhost-net%d,client=1,queues=1' " % (i, i)
+ vdev_info += "--vdev 'net_vhost%d,iface=%s/vhost-net%d,client=1,queues=1' " % (i, self.base_dir, i)
params = "--port-topology=chained --nb-cores=4 --txd=1024 --rxd=1024"
eal_param = "--socket-mem 2048,2048 --legacy-mem --file-prefix=vhost %s " % vdev_info
self.vhost_testpmd = PmdOutput(self.dut)
@@ -195,7 +196,7 @@ class TestPVPVirtIOBonding(TestCase):
for i in range(self.queues):
vm_params['opt_server'] = 'server'
vm_params['driver'] = 'vhost-user'
- vm_params['opt_path'] = './vhost-net%d' % i
+ vm_params['opt_path'] = '%s/vhost-net%d' % (self.base_dir, i)
vm_params['opt_mac'] = "%s%d" % (virtio_mac, i+1)
self.vm.set_vm_device(**vm_params)
self.set_vm_vcpu()
--
2.17.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dts] [PATCH V1 3/8] tests/pvp_vhost_user_reconnect:vhost-net changed to absolute path
2019-09-04 6:55 [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 2/8] tests/pvp_virtio_bonding:vhost-net " zhuwenhui
@ 2019-09-04 6:55 ` zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 4/8] tests/vhost_dequeue_zero_copy:vhost-net " zhuwenhui
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: zhuwenhui @ 2019-09-04 6:55 UTC (permalink / raw)
To: dts; +Cc: zhuwenhui
Vhost-net changed to absolute path.
Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
tests/TestSuite_pvp_vhost_user_reconnect.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/TestSuite_pvp_vhost_user_reconnect.py b/tests/TestSuite_pvp_vhost_user_reconnect.py
index 69c4bed..c5c7b96 100644
--- a/tests/TestSuite_pvp_vhost_user_reconnect.py
+++ b/tests/TestSuite_pvp_vhost_user_reconnect.py
@@ -83,6 +83,7 @@ class TestPVPVhostUserReconnect(TestCase):
self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
# create an instance to set stream field setting
self.pktgen_helper = PacketGeneratorHelper()
+ self.base_dir = self.dut.base_dir.replace('~', '/root')
def set_up(self):
"""
@@ -91,7 +92,7 @@ class TestPVPVhostUserReconnect(TestCase):
"""
self.dut.send_expect("killall -s INT testpmd", "# ")
self.dut.send_expect("killall -s INT qemu-system-x86_64", "# ")
- self.dut.send_expect("rm -rf ./vhost-net*", "# ")
+ self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "# ")
self.vhost_user = self.dut.new_session(suite="vhost-user")
def launch_testpmd_as_vhost_user(self):
@@ -100,7 +101,7 @@ class TestPVPVhostUserReconnect(TestCase):
"""
vdev_info = ""
for i in range(self.vm_num):
- vdev_info += "--vdev 'net_vhost%d,iface=vhost-net%d,client=1,queues=1' " % (i, i)
+ vdev_info += "--vdev 'net_vhost%d,iface=%s/vhost-net%d,client=1,queues=1' " % (i, self.base_dir, i)
self.vhostapp_testcmd = self.dut.base_dir + \
"/%s/app/testpmd -c %s -n %d --socket-mem %s --legacy-mem" + \
" --file-prefix=vhost %s" + \
@@ -119,7 +120,7 @@ class TestPVPVhostUserReconnect(TestCase):
"""
vdev_info = ""
for i in range(self.vm_num):
- vdev_info += "--vdev 'net_vhost%d,iface=vhost-net%d,client=1,queues=1' " % (i, i)
+ vdev_info += "--vdev 'net_vhost%d,iface=%s/vhost-net%d,client=1,queues=1' " % (i, self.base_dir, i)
self.vhostapp_testcmd = self.dut.base_dir + \
"/%s/app/testpmd -c %s -n %d --socket-mem %s --legacy-mem" + \
" --no-pci --file-prefix=vhost %s" + \
@@ -180,7 +181,7 @@ class TestPVPVhostUserReconnect(TestCase):
vm_info = VM(self.dut, 'vm%d' % i, 'vhost_sample')
vm_params = {}
vm_params['driver'] = 'vhost-user'
- vm_params['opt_path'] = './vhost-net%d' % (i)
+ vm_params['opt_path'] = '%s/vhost-net%d' % (self.base_dir, i)
vm_params['opt_mac'] = '52:54:00:00:00:0%d' % (i+1)
vm_params['opt_server'] = 'server'
vm_params['opt_settings'] = 'mrg_rxbuf=on,rx_queue_size=1024,tx_queue_size=1024'
--
2.17.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dts] [PATCH V1 4/8] tests/vhost_dequeue_zero_copy:vhost-net changed to absolute path
2019-09-04 6:55 [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 2/8] tests/pvp_virtio_bonding:vhost-net " zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 3/8] tests/pvp_vhost_user_reconnect:vhost-net " zhuwenhui
@ 2019-09-04 6:55 ` zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 5/8] tests/virtio_event_idx_interrupt:vhost-net " zhuwenhui
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: zhuwenhui @ 2019-09-04 6:55 UTC (permalink / raw)
To: dts; +Cc: zhuwenhui
Vhost-net changed to absolute path.
Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
tests/TestSuite_vhost_dequeue_zero_copy.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/TestSuite_vhost_dequeue_zero_copy.py b/tests/TestSuite_vhost_dequeue_zero_copy.py
index 5935536..5705064 100644
--- a/tests/TestSuite_vhost_dequeue_zero_copy.py
+++ b/tests/TestSuite_vhost_dequeue_zero_copy.py
@@ -80,6 +80,7 @@ class TestVhostDequeueZeroCopy(TestCase):
self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
# create an instance to set stream field setting
self.pktgen_helper = PacketGeneratorHelper()
+ self.base_dir = self.dut.base_dir.replace('~', '/root')
def set_up(self):
"""
@@ -88,7 +89,7 @@ class TestVhostDequeueZeroCopy(TestCase):
# Clean the execution ENV
self.dut.send_expect("killall -s INT testpmd", "#")
self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
- self.dut.send_expect("rm -rf ./vhost-net*", "#")
+ self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
# Prepare the result table
self.table_header = ["FrameSize(B)", "Throughput(Mpps)",
"% linerate", "Queue number", "Cycle"]
@@ -120,11 +121,11 @@ class TestVhostDequeueZeroCopy(TestCase):
command_client = self.dut.target + "/app/testpmd " + \
" -n %d -c %s --socket-mem 1024,1024 " + \
" --legacy-mem --file-prefix=vhost " + \
- " --vdev 'eth_vhost0,iface=vhost-net,queues=%d,dequeue-zero-copy=1' " + \
+ " --vdev 'eth_vhost0,iface=%s/vhost-net,queues=%d,dequeue-zero-copy=1' " + \
" -- -i --nb-cores=%d --rxq=%d --txq=%d " + \
"--txd=1024 --rxd=1024 %s"
command_line_client = command_client % (
- self.mem_channels, self.core_mask,
+ self.mem_channels, self.core_mask, self.base_dir,
self.queue_number, self.nb_cores,
self.queue_number, self.queue_number, txfreet_args)
self.vhost.send_expect(command_line_client, "testpmd> ", 120)
@@ -173,7 +174,7 @@ class TestVhostDequeueZeroCopy(TestCase):
self.vm.load_config()
vm_params = {}
vm_params['driver'] = 'vhost-user'
- vm_params['opt_path'] = './vhost-net'
+ vm_params['opt_path'] = '%s/vhost-net' % self.base_dir
vm_params['opt_mac'] = self.virtio1_mac
opt_args = "mrg_rxbuf=on,rx_queue_size=1024,tx_queue_size=1024"
if self.queue_number > 1:
--
2.17.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dts] [PATCH V1 5/8] tests/virtio_event_idx_interrupt:vhost-net changed to absolute path
2019-09-04 6:55 [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path zhuwenhui
` (2 preceding siblings ...)
2019-09-04 6:55 ` [dts] [PATCH V1 4/8] tests/vhost_dequeue_zero_copy:vhost-net " zhuwenhui
@ 2019-09-04 6:55 ` zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 6/8] tests/vhost_virtio_pmd_interrupt:vhost-net " zhuwenhui
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: zhuwenhui @ 2019-09-04 6:55 UTC (permalink / raw)
To: dts; +Cc: zhuwenhui
Vhost-net changed to absolute path.
Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
tests/TestSuite_virtio_event_idx_interrupt.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/TestSuite_virtio_event_idx_interrupt.py b/tests/TestSuite_virtio_event_idx_interrupt.py
index acaa18a..5abad20 100644
--- a/tests/TestSuite_virtio_event_idx_interrupt.py
+++ b/tests/TestSuite_virtio_event_idx_interrupt.py
@@ -59,6 +59,7 @@ class TestVirtioIdxInterrupt(TestCase, IxiaPacketGenerator):
== self.ports_socket])
self.mem_channels = self.dut.get_memory_channels()
self.dst_mac = self.dut.get_mac_address(self.dut_ports[0])
+ self.base_dir = self.dut.base_dir.replace('~', '/root')
def set_up(self):
"""
@@ -68,7 +69,7 @@ class TestVirtioIdxInterrupt(TestCase, IxiaPacketGenerator):
self.flag = None
self.dut.send_expect("killall -s INT testpmd", "#")
self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
- self.dut.send_expect("rm -rf ./vhost-net*", "#")
+ self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
self.vhost = self.dut.new_session(suite="vhost")
def ip(self, port, frag, src, proto, tos, dst, chksum, len, options,
@@ -104,9 +105,9 @@ class TestVirtioIdxInterrupt(TestCase, IxiaPacketGenerator):
self.get_core_mask()
command_line = self.dut.target + "/app/testpmd -c %s -n %d " + \
"--socket-mem 2048,2048 --legacy-mem --file-prefix=vhost " + \
- "--vdev 'net_vhost,iface=vhost-net,queues=%d' -- -i " + \
+ "--vdev 'net_vhost,iface=%s/vhost-net,queues=%d' -- -i " + \
"--nb-cores=%d --txd=1024 --rxd=1024 --rxq=%d --txq=%d"
- command_line = command_line % (self.core_mask, self.mem_channels,
+ command_line = command_line % (self.core_mask, self.mem_channels, self.base_dir,
self.queues, self.nb_cores, self.queues, self.queues)
self.vhost.send_expect(command_line, "testpmd> ", 30)
self.vhost.send_expect("start", "testpmd> ", 30)
@@ -118,7 +119,7 @@ class TestVirtioIdxInterrupt(TestCase, IxiaPacketGenerator):
self.vm = VM(self.dut, 'vm0', 'vhost_sample')
vm_params = {}
vm_params['driver'] = 'vhost-user'
- vm_params['opt_path'] = './vhost-net'
+ vm_params['opt_path'] = '%s/vhost-net' % self.base_dir
vm_params['opt_mac'] = "00:11:22:33:44:55"
opt_args = "mrg_rxbuf=on,csum=on,gso=on,guest_csum=on,host_tso4=on,guest_tso4=on"
if self.queues > 1:
--
2.17.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dts] [PATCH V1 6/8] tests/vhost_virtio_pmd_interrupt:vhost-net changed to absolute path
2019-09-04 6:55 [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path zhuwenhui
` (3 preceding siblings ...)
2019-09-04 6:55 ` [dts] [PATCH V1 5/8] tests/virtio_event_idx_interrupt:vhost-net " zhuwenhui
@ 2019-09-04 6:55 ` zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 7/8] tests/TestSuite_pvp_diff_qemu_version:vhost-net " zhuwenhui
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: zhuwenhui @ 2019-09-04 6:55 UTC (permalink / raw)
To: dts; +Cc: zhuwenhui
Vhost-net changed to absolute path.
Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
tests/TestSuite_vhost_virtio_pmd_interrupt.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/TestSuite_vhost_virtio_pmd_interrupt.py b/tests/TestSuite_vhost_virtio_pmd_interrupt.py
index 41b2b41..d31122b 100644
--- a/tests/TestSuite_vhost_virtio_pmd_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_pmd_interrupt.py
@@ -69,6 +69,7 @@ class TestVhostVirtioPmdInterrupt(TestCase):
self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
# create an instance to set stream field setting
self.pktgen_helper = PacketGeneratorHelper()
+ self.base_dir = self.dut.base_dir.replace('~', '/root')
def set_up(self):
"""
@@ -78,7 +79,7 @@ class TestVhostVirtioPmdInterrupt(TestCase):
self.verify_info = []
self.dut.send_expect("killall -s INT testpmd", "#")
self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
- self.dut.send_expect("rm -rf ./vhost-net*", "#")
+ self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
self.vhost_user = self.dut.new_session(suite="vhost-user")
self.vm_dut = None
@@ -117,10 +118,10 @@ class TestVhostVirtioPmdInterrupt(TestCase):
command_client = self.dut.target + "/app/testpmd -c %s -n %d " + \
"--socket-mem 1024,1024 --legacy-mem " + \
- "--vdev 'net_vhost0,iface=vhost-net,queues=%d' " + \
+ "--vdev 'net_vhost0,iface=%s/vhost-net,queues=%d' " + \
"-- -i --nb-cores=%d --rxq=%d --txq=%d --rss-ip"
command_line_client = command_client % (
- self.core_mask, self.mem_channels,
+ self.core_mask, self.mem_channels, self.base_dir,
self.queues, self.nb_cores, self.queues, self.queues)
self.vhost_user.send_expect(command_line_client, "testpmd> ", 120)
self.vhost_user.send_expect("start", "testpmd> ", 120)
@@ -175,7 +176,7 @@ class TestVhostVirtioPmdInterrupt(TestCase):
self.vm.load_config()
vm_params = {}
vm_params['driver'] = 'vhost-user'
- vm_params['opt_path'] = './vhost-net'
+ vm_params['opt_path'] = '%s/vhost-net' % self.base_dir
vm_params['opt_mac'] = "00:11:22:33:44:55"
vm_params['opt_queue'] = self.queues
opt_param = "mrg_rxbuf=on,csum=on,mq=on,vectors=%d" % (2*self.queues+2)
--
2.17.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dts] [PATCH V1 7/8] tests/TestSuite_pvp_diff_qemu_version:vhost-net changed to absolute path
2019-09-04 6:55 [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path zhuwenhui
` (4 preceding siblings ...)
2019-09-04 6:55 ` [dts] [PATCH V1 6/8] tests/vhost_virtio_pmd_interrupt:vhost-net " zhuwenhui
@ 2019-09-04 6:55 ` zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 8/8] tests/pvp_qemu_multi_paths_port_restart:vhost-net " zhuwenhui
2019-09-17 0:47 ` [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net " Tu, Lijuan
7 siblings, 0 replies; 9+ messages in thread
From: zhuwenhui @ 2019-09-04 6:55 UTC (permalink / raw)
To: dts; +Cc: zhuwenhui
Vhost-net changed to absolute path.
Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
tests/TestSuite_pvp_diff_qemu_version.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/TestSuite_pvp_diff_qemu_version.py b/tests/TestSuite_pvp_diff_qemu_version.py
index d1952b5..9e8259b 100644
--- a/tests/TestSuite_pvp_diff_qemu_version.py
+++ b/tests/TestSuite_pvp_diff_qemu_version.py
@@ -81,13 +81,14 @@ class TestVhostPVPDiffQemuVersion(TestCase):
self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
# create an instance to set stream field setting
self.pktgen_helper = PacketGeneratorHelper()
+ self.base_dir = self.dut.base_dir.replace('~', '/root')
def set_up(self):
"""
Run before each test case.
"""
self.vhost = self.dut.new_session(suite="vhost-user")
- self.dut.send_expect("rm -rf ./vhost-net*", "#")
+ self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
self.dut.send_expect("killall -s INT testpmd", "#")
self.dut.send_expect("killall -I qemu-system-x86_64", '#', 20)
@@ -176,7 +177,7 @@ class TestVhostPVPDiffQemuVersion(TestCase):
self.vm = VM(self.dut, 'vm0', 'pvp_diff_qemu_version')
vm_params = {}
vm_params['driver'] = 'vhost-user'
- vm_params['opt_path'] = './vhost-net'
+ vm_params['opt_path'] = '%s/vhost-net' % self.base_dir
vm_params['opt_mac'] = self.virtio1_mac
if(modem == 1):
vm_params['opt_settings'] = "disable-modern=false,mrg_rxbuf=on"
@@ -202,10 +203,10 @@ class TestVhostPVPDiffQemuVersion(TestCase):
"""
command_line_client = self.dut.target + "/app/testpmd -n %d -c %s \
--socket-mem 1024,1024 --file-prefix=vhost \
- --vdev 'eth_vhost0,iface=vhost-net,queues=1' -- \
+ --vdev 'eth_vhost0,iface=%s/vhost-net,queues=1' -- \
-i --nb-cores=1 --txd=1024 --rxd=1024"
command_line_client = command_line_client % (
- self.memory_channel, self.coremask)
+ self.memory_channel, self.coremask, self.base_dir)
self.vhost.send_expect(command_line_client, "testpmd> ", 30)
self.vhost.send_expect("set fwd mac", "testpmd> ", 30)
self.vhost.send_expect("start", "testpmd> ", 30)
@@ -260,7 +261,7 @@ class TestVhostPVPDiffQemuVersion(TestCase):
self.vhost.send_expect("quit", "#", 20)
self.vm.stop()
self.dut.send_expect("killall -I testpmd", '#', 20)
- self.dut.send_expect("rm -rf ./vhost-net*", "#")
+ self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
def test_perf_vhost_pvp_diffrent_qemu_version_mergeable_mac(self):
"""
--
2.17.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [dts] [PATCH V1 8/8] tests/pvp_qemu_multi_paths_port_restart:vhost-net changed to absolute path
2019-09-04 6:55 [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path zhuwenhui
` (5 preceding siblings ...)
2019-09-04 6:55 ` [dts] [PATCH V1 7/8] tests/TestSuite_pvp_diff_qemu_version:vhost-net " zhuwenhui
@ 2019-09-04 6:55 ` zhuwenhui
2019-09-17 0:47 ` [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net " Tu, Lijuan
7 siblings, 0 replies; 9+ messages in thread
From: zhuwenhui @ 2019-09-04 6:55 UTC (permalink / raw)
To: dts; +Cc: zhuwenhui
Vhost-net changed to absolute path.
Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
tests/TestSuite_pvp_qemu_multi_paths_port_restart.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py b/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py
index 429628c..0095ce2 100644
--- a/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py
+++ b/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py
@@ -72,6 +72,7 @@ class TestPVPQemuMultiPathPortRestart(TestCase):
self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
# create an instance to set stream field setting
self.pktgen_helper = PacketGeneratorHelper()
+ self.base_dir = self.dut.base_dir.replace('~', '/root')
def set_up(self):
"""
@@ -93,14 +94,14 @@ class TestPVPQemuMultiPathPortRestart(TestCase):
start testpmd on vhost
"""
self.dut.send_expect("killall -s INT testpmd", "#")
- self.dut.send_expect("rm -rf ./vhost-net*", "#")
+ self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
command_client = self.dut.target + "/app/testpmd " + \
" -n %d -c %s --socket-mem 1024,1024 " + \
" --legacy-mem --file-prefix=vhost " + \
- " --vdev 'net_vhost0,iface=vhost-net,queues=1' " + \
+ " --vdev 'net_vhost0,iface=%s/vhost-net,queues=1' " + \
" -- -i --nb-cores=1 --txd=1024 --rxd=1024"
command_line_client = command_client % (
- self.dut.get_memory_channels(), self.core_mask)
+ self.dut.get_memory_channels(), self.core_mask, self.base_dir)
self.vhost.send_expect(command_line_client, "testpmd> ", 120)
self.vhost.send_expect("set fwd mac", "testpmd> ", 120)
self.vhost.send_expect("start", "testpmd> ", 120)
@@ -133,7 +134,7 @@ class TestPVPQemuMultiPathPortRestart(TestCase):
self.vm = VM(self.dut, 'vm0', 'vhost_sample')
vm_params = {}
vm_params['driver'] = 'vhost-user'
- vm_params['opt_path'] = './vhost-net'
+ vm_params['opt_path'] = '%s/vhost-net' % self.base_dir
vm_params['opt_mac'] = self.virtio1_mac
if modem == 1 and mergeable == 0:
vm_params['opt_settings'] = "disable-modern=false,mrg_rxbuf=off,rx_queue_size=1024,tx_queue_size=1024"
--
2.17.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path
2019-09-04 6:55 [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path zhuwenhui
` (6 preceding siblings ...)
2019-09-04 6:55 ` [dts] [PATCH V1 8/8] tests/pvp_qemu_multi_paths_port_restart:vhost-net " zhuwenhui
@ 2019-09-17 0:47 ` Tu, Lijuan
7 siblings, 0 replies; 9+ messages in thread
From: Tu, Lijuan @ 2019-09-17 0:47 UTC (permalink / raw)
To: Zhu, WenhuiX, dts; +Cc: Zhu, WenhuiX
Applied the series, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhuwenhui
> Sent: Wednesday, September 4, 2019 2:56 PM
> To: dts@dpdk.org
> Cc: Zhu, WenhuiX <wenhuix.zhu@intel.com>
> Subject: [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed
> to absolute path
>
> Vhost-net changed to absolute path.
>
> Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
> ---
> tests/TestSuite_virtio_pvp_regression.py | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/tests/TestSuite_virtio_pvp_regression.py
> b/tests/TestSuite_virtio_pvp_regression.py
> index 902ac09..84bf8c2 100644
> --- a/tests/TestSuite_virtio_pvp_regression.py
> +++ b/tests/TestSuite_virtio_pvp_regression.py
> @@ -91,13 +91,14 @@ class TestVirtioPVPRegression(TestCase):
> self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
> # create an instance to set stream field setting
> self.pktgen_helper = PacketGeneratorHelper()
> + self.base_dir = self.dut.base_dir.replace('~', '/root')
>
> def set_up(self):
> """
> Run before each test case.
> """
> self.vhost = self.dut.new_session(suite="vhost-user")
> - self.dut.send_expect("rm -rf ./vhost-net*", "#")
> + self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir,
> + "#")
>
> def packet_params_set(self):
> self.frame_sizes = [64, 1518]
> @@ -205,7 +206,7 @@ class TestVirtioPVPRegression(TestCase):
> self.vm = VM(self.dut, 'vm0', self.suite_name)
> vm_params = {}
> vm_params['driver'] = 'vhost-user'
> - vm_params['opt_path'] = './vhost-net'
> + vm_params['opt_path'] = '%s/vhost-net' % self.base_dir
> vm_params['opt_mac'] = self.virtio1_mac
> vm_params['opt_server'] = 'server'
> vm_params['opt_queue'] = self.queues_number @@ -249,11 +250,11
> @@ class TestVirtioPVPRegression(TestCase):
> """
> command_line_client = self.dut.target + "/app/testpmd -n %d -c %s \
> --socket-mem %s --file-prefix=vhost -w %s \
> - --vdev 'eth_vhost0,iface=vhost-net,queues=%d,client=1' -- \
> + --vdev 'eth_vhost0,iface=%s/vhost-net,queues=%d,client=1'
> + -- \
> -i --nb-cores=%d --rxq=%d --txq=%d --txd=1024 --rxd=1024"
> command_line_client = command_line_client % (
> self.memory_channel, self.coremask, self.socket_mem,
> - self.dut.ports_info[self.pf]['pci'],
> + self.dut.ports_info[self.pf]['pci'],
> + self.base_dir,
> self.queues_number, self.queues_number,
> self.queues_number,
> self.queues_number)
> self.vhost.send_expect(command_line_client, "testpmd> ", 30) @@ -
> 346,7 +347,7 @@ class TestVirtioPVPRegression(TestCase):
> self.vm.stop()
> self.dut.send_expect("killall -I testpmd", '#', 20)
> self.dut.send_expect('killall -s INT qemu-system-x86_64', '# ')
> - self.dut.send_expect("rm -rf ./vhost-net*", "#")
> + self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir,
> + "#")
>
> def pvp_regression_run(self, case_info, modem, virtio_path):
> """
> --
> 2.17.2
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-09-17 0:54 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-04 6:55 [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net changed to absolute path zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 2/8] tests/pvp_virtio_bonding:vhost-net " zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 3/8] tests/pvp_vhost_user_reconnect:vhost-net " zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 4/8] tests/vhost_dequeue_zero_copy:vhost-net " zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 5/8] tests/virtio_event_idx_interrupt:vhost-net " zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 6/8] tests/vhost_virtio_pmd_interrupt:vhost-net " zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 7/8] tests/TestSuite_pvp_diff_qemu_version:vhost-net " zhuwenhui
2019-09-04 6:55 ` [dts] [PATCH V1 8/8] tests/pvp_qemu_multi_paths_port_restart:vhost-net " zhuwenhui
2019-09-17 0:47 ` [dts] [PATCH V1 1/8] tests/virtio_pvp_regression:vhost-net " 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).