[dts] [PATCH V1 01/17] tests/pvp_multi_paths_vhost_single_core_performance:vhost-net changed to absolute path

[dts] [PATCH V1 01/17] tests/pvp_multi_paths_vhost_single_core_performance:vhost-net changed to absolute path

[zhuwenhui]

Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
 ...e_pvp_multi_paths_vhost_single_core_performance.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py b/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py
index fcaadf2..2cbacc9 100644
--- a/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py
+++ b/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py
@@ -68,6 +68,7 @@ class TestPVPMultiPathVhostPerformance(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):
         """
@@ -120,14 +121,14 @@ class TestPVPMultiPathVhostPerformance(TestCase):
         """
         # Clean the execution ENV
         self.dut.send_expect("rm -rf ./vhost.out", "#")
-        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 -s INT qemu-system-x86_64", "#")
         command_line_client = "./x86_64-native-linuxapp-gcc/app/testpmd -n %d -c %s --socket-mem " + \
                               " %s --legacy-mem --no-pci --file-prefix=vhost --vdev " + \
-                              "'net_vhost0,iface=vhost-net,queues=1' -- -i --nb-cores=1 --txd=1024 --rxd=1024"
+                              "'net_vhost0,iface=%s/vhost-net,queues=1' -- -i --nb-cores=1 --txd=1024 --rxd=1024"
         command_line_client = command_line_client % (
-            self.dut.get_memory_channels(), self.core_mask_host, self.socket_mem)
+            self.dut.get_memory_channels(), self.core_mask_host, self.socket_mem, 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)
@@ -138,10 +139,10 @@ class TestPVPMultiPathVhostPerformance(TestCase):
         """
         command_line_user = "./x86_64-native-linuxapp-gcc/app/testpmd -n %d -c %s " + \
                             " --socket-mem %s --legacy-mem --file-prefix=virtio " + \
-                            "--vdev=virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,queues=1,%s " + \
+                            "--vdev=virtio_user0,mac=00:01:02:03:04:05,path=%s/vhost-net,queues=1,%s " + \
                             "-- -i %s --nb-cores=2 --txd=1024 --rxd=1024"
         command_line_user = command_line_user % (
-            self.dut.get_memory_channels(), self.core_mask_user, self.socket_mem, args["version"], args["path"])
+            self.dut.get_memory_channels(), self.core_mask_user, self.socket_mem, self.base_dir, args["version"], args["path"])
         self.vhost_user.send_expect(command_line_user, "testpmd> ", 120)
         self.vhost_user.send_expect("set fwd io", "testpmd> ", 120)
         self.vhost_user.send_expect("start", "testpmd> ", 120)
-- 
2.17.2

[dts] [PATCH V1 02/17] tests/pvp_multi_paths_virtio_single_core_performance:vhost-net changed to absolute path

[zhuwenhui]

Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
 ..._pvp_multi_paths_virtio_single_core_performance.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py b/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py
index 6cd3a6d..23602b1 100644
--- a/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py
+++ b/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py
@@ -69,6 +69,7 @@ class TestPVPMultiPathVirtioPerformance(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):
         """
@@ -124,15 +125,15 @@ class TestPVPMultiPathVirtioPerformance(TestCase):
         start testpmd on vhost
         """
         self.dut.send_expect("rm -rf ./vhost.out", "#")
-        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 -s INT qemu-system-x86_64", "#")
         command_line_client = "./%s/app/testpmd -n %d -c %s --socket-mem " + \
                               " %s --legacy-mem -w %s --file-prefix=vhost --vdev " + \
-                              "'net_vhost0,iface=vhost-net,queues=1,client=0' -- -i --nb-cores=2 --txd=1024 --rxd=1024"
+                              "'net_vhost0,iface=%s/vhost-net,queues=1,client=0' -- -i --nb-cores=2 --txd=1024 --rxd=1024"
         command_line_client = command_line_client % (self.target,
             self.dut.get_memory_channels(), self.core_mask_host,
-            self.socket_mem, self.dut.ports_info[self.dut_ports[0]]['pci'])
+            self.socket_mem, self.dut.ports_info[self.dut_ports[0]]['pci'], self.base_dir)
         self.vhost.send_expect(command_line_client, "testpmd> ", 120)
         self.vhost.send_expect("set fwd io", "testpmd> ", 120)
         self.vhost.send_expect("start", "testpmd> ", 120)
@@ -143,11 +144,11 @@ class TestPVPMultiPathVirtioPerformance(TestCase):
         """
         command_line_user = "./%s/app/testpmd -n %d -c %s " + \
                             " --socket-mem %s --legacy-mem --no-pci --file-prefix=virtio " + \
-                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,%s " + \
+                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=%s/vhost-net,%s " + \
                             "-- -i %s --rss-ip --nb-cores=1 --txd=1024 --rxd=1024"
         command_line_user = command_line_user % (self.target,
             self.dut.get_memory_channels(), self.core_mask_user,
-            self.socket_mem, args["version"], args["path"])
+            self.socket_mem, self.base_dir, args["version"], args["path"])
         self.vhost_user.send_expect(command_line_user, "testpmd> ", 120)
         self.vhost_user.send_expect("set fwd mac", "testpmd> ", 120)
         self.vhost_user.send_expect("start", "testpmd> ", 120)
-- 
2.17.2

[dts] [PATCH V1 03/17] tests/TestSuite_pvp_multi_paths_performance:vhost-net changed to absolute path

[zhuwenhui]

Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
 tests/TestSuite_pvp_multi_paths_performance.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_pvp_multi_paths_performance.py b/tests/TestSuite_pvp_multi_paths_performance.py
index b633b98..7000afd 100644
--- a/tests/TestSuite_pvp_multi_paths_performance.py
+++ b/tests/TestSuite_pvp_multi_paths_performance.py
@@ -69,6 +69,7 @@ class TestPVPMultiPathPerformance(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):
         """
@@ -123,15 +124,15 @@ class TestPVPMultiPathPerformance(TestCase):
         start testpmd on vhost
         """
         self.dut.send_expect("rm -rf ./vhost.out", "#")
-        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 -s INT qemu-system-x86_64", "#")
         command_line_client = "./%s/app/testpmd -n %d -c %s --socket-mem " + \
                               " %s --legacy-mem -w %s --file-prefix=vhost --vdev " + \
-                              "'net_vhost0,iface=vhost-net,queues=1,client=0' -- -i --nb-cores=1 --txd=1024 --rxd=1024"
+                              "'net_vhost0,iface=%s/vhost-net,queues=1,client=0' -- -i --nb-cores=1 --txd=1024 --rxd=1024"
         command_line_client = command_line_client % (self.target,
             self.dut.get_memory_channels(), self.core_mask_host,
-            self.socket_mem, self.dut.ports_info[self.dut_ports[0]]['pci'])
+            self.socket_mem, self.dut.ports_info[self.dut_ports[0]]['pci'], 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)
@@ -142,11 +143,11 @@ class TestPVPMultiPathPerformance(TestCase):
         """
         command_line_user = "./%s/app/testpmd -n %d -c %s " + \
                             " --socket-mem %s --legacy-mem --no-pci --file-prefix=virtio " + \
-                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,%s " + \
+                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=%s/vhost-net,%s " + \
                             "-- -i %s --rss-ip --nb-cores=1 --txd=1024 --rxd=1024"
         command_line_user = command_line_user % (self.target,
             self.dut.get_memory_channels(), self.core_mask_user,
-            self.socket_mem, args["version"], args["path"])
+            self.socket_mem, self.base_dir, args["version"], args["path"])
         self.vhost_user = self.dut.new_session(suite="user")
         self.vhost_user.send_expect(command_line_user, "testpmd> ", 120)
         self.vhost_user.send_expect("set fwd mac", "testpmd> ", 120)
-- 
2.17.2

[dts] [PATCH V1 04/17] tests/pvp_qemu_multi_paths_port_restart:vhost-net changed to absolute path

[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

[dts] [PATCH V1 05/17] tests/TestSuite_pvp_diff_qemu_version:vhost-net changed to absolute path

[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

[dts] [PATCH V1 06/17] tests/vhost_virtio_pmd_interrupt:vhost-net changed to absolute path

[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..4832eee 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

[dts] [PATCH V1 07/17] tests/virtio_event_idx_interrupt:vhost-net changed to absolute path

[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..d91c307 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

[dts] [PATCH V1 08/17] tests/vhost_dequeue_zero_copy:vhost-net changed to absolute path

[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..c54d7ed 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

[dts] [PATCH V1 09/17] tests/pvp_virtio_user_multi_queues:vhost-net changed to absolute path

[zhuwenhui]

Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
 tests/TestSuite_pvp_virtio_user_multi_queues.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_pvp_virtio_user_multi_queues.py b/tests/TestSuite_pvp_virtio_user_multi_queues.py
index ff8a0c4..8a85b6c 100644
--- a/tests/TestSuite_pvp_virtio_user_multi_queues.py
+++ b/tests/TestSuite_pvp_virtio_user_multi_queues.py
@@ -85,13 +85,14 @@ class TestPVPVirtioMultiQueues(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.
         """
         # Prepare the result table
-        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.table_header = ["Frame", "Mode", "Throughput(Mpps)", "% linerate"]
         self.result_table_create(self.table_header)
@@ -105,10 +106,10 @@ class TestPVPVirtioMultiQueues(TestCase):
         """
         command_line_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=2,client=0' -- -i --nb-cores=2 " + \
+                              "'net_vhost0,iface=%s/vhost-net,queues=2,client=0' -- -i --nb-cores=2 " + \
                               "--rxq=2 --txq=2 --rss-ip"
         command_line_client = command_line_client % (
-            self.dut.get_memory_channels(), self.core_mask_host)
+            self.dut.get_memory_channels(), self.core_mask_host, self.base_dir)
         self.vhost_user.send_expect(command_line_client, "testpmd> ", 120)
         self.vhost_user.send_expect("set fwd mac", "testpmd> ", 120)
         self.vhost_user.send_expect("start", "testpmd> ", 120)
@@ -119,11 +120,11 @@ class TestPVPVirtioMultiQueues(TestCase):
         """
         command_line_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
                             " --socket-mem 1024,1024 --legacy-mem --no-pci --file-prefix=virtio " + \
-                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,queues=2,%s " + \
+                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=%s/vhost-net,queues=2,%s " + \
                             "-- -i %s --rss-ip --nb-cores=2 --rxq=2 --txq=2"
         command_line_user = command_line_user % (
             self.dut.get_memory_channels(), self.core_mask_user,
-            args["version"], args["path"])
+            self.base_dir, args["version"], args["path"])
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120)
         self.virtio_user.send_expect("start", "testpmd> ", 120)
-- 
2.17.2

[dts] [PATCH V1 10/17] tests/pvp_vhost_user_built_in_net_driver:vhost-net changed to absolute path

[zhuwenhui]

Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
 tests/TestSuite_pvp_vhost_user_built_in_net_driver.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py
index 52d9df9..6c65b7e 100644
--- a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py
+++ b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py
@@ -78,12 +78,13 @@ class TestPVPVhostUserBuiltInNetDriver(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.dut.send_expect("rm -rf ./vhost-net*", "# ")
+        self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "# ")
         self.dut.send_expect("rm -rf ./vhost.out", "# ")
         self.dut.send_expect("killall -s INT vhost", "# ")
         self.dut.send_expect("killall -s INT testpmd", "# ")
@@ -160,10 +161,10 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase):
         command_line_client = "./examples/vhost/build/app/vhost-switch " + \
                               "-c %s -n %d --socket-mem 2048,2048 -- " + \
                               "-p 0x1 --mergeable 0 --vm2vm 1 " + \
-                              "--builtin-net-driver  --socket-file ./vhost-net" + \
+                              "--builtin-net-driver  --socket-file %s/vhost-net" + \
                               "> ./vhost.out &"
         command_line_client = command_line_client % (self.core_mask_vhost_user,
-                                            self.mem_channels)
+                                            self.mem_channels, self.base_dir)
         self.vhost_switch.send_expect(command_line_client, "# ", 120)
         time.sleep(15)
         try:
@@ -186,10 +187,10 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase):
         """
         command_line_user = "./%s/app/testpmd -n %d -c %s " + \
                             "--no-pci --socket-mem 2048,2048 --file-prefix=virtio-user " + \
-                            "--vdev=net_virtio_user0,mac=%s,path=./vhost-net,queues=1 " + \
+                            "--vdev=net_virtio_user0,mac=%s,path=%s/vhost-net,queues=1 " + \
                             "-- -i --rxq=1 --txq=1"
         command_line_user = command_line_user % (self.target,
-            self.mem_channels, self.core_mask_virtio_user, self.virtio_mac)
+            self.mem_channels, self.core_mask_virtio_user, self.virtio_mac, self.base_dir)
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120)
         self.virtio_user.send_expect("start tx_first", "testpmd> ", 120)
-- 
2.17.2

[dts] [PATCH V1 11/17] tests/pvp_share_lib:vhost-net changed to absolute path

[zhuwenhui]

Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
 tests/TestSuite_pvp_share_lib.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_pvp_share_lib.py b/tests/TestSuite_pvp_share_lib.py
index f117fd5..d5b954a 100644
--- a/tests/TestSuite_pvp_share_lib.py
+++ b/tests/TestSuite_pvp_share_lib.py
@@ -70,12 +70,13 @@ class TestPVPShareLib(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.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.vhost_user = self.dut.new_session(suite="vhost-user")
         self.virtio_user = self.dut.new_session(suite="virtio-user")
@@ -137,9 +138,9 @@ class TestPVPShareLib(TestCase):
                               "--socket-mem 2048,2048 --legacy-mem " + \
                               "-d librte_pmd_vhost.so -d librte_pmd_%s.so " + \
                               "-d librte_mempool_ring.so --file-prefix=vhost " + \
-                              "--vdev 'net_vhost0,iface=vhost-net,queues=1' -- -i"
+                              "--vdev 'net_vhost0,iface=%s/vhost-net,queues=1' -- -i"
         command_line_client = command_line_client % (self.target,
-                        self.core_mask_vhost_user, self.mem_channels, driver)
+                        self.core_mask_vhost_user, self.mem_channels, driver, self.base_dir)
         self.vhost_user.send_expect(command_line_client, "testpmd> ", 120)
         self.vhost_user.send_expect("start", "testpmd> ", 120)
 
@@ -151,9 +152,9 @@ class TestPVPShareLib(TestCase):
                             "--no-pci --socket-mem 2048,2048 --legacy-mem " + \
                             "--file-prefix=virtio-user " + \
                             "-d librte_pmd_virtio.so -d librte_mempool_ring.so " + \
-                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net -- -i"
+                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=%s/vhost-net -- -i"
         command_line_user = command_line_user % (self.target,
-                self.mem_channels, self.core_mask_virtio_user)
+                self.mem_channels, self.core_mask_virtio_user, self.base_dir)
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("start", "testpmd> ", 120)
 
-- 
2.17.2

[dts] [PATCH V1 12/17] tests/pvp_virtio_user_2M_hugepages:vhost-net changed to absolute path

[zhuwenhui]

Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
 tests/TestSuite_pvp_virtio_user_2M_hugepages.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_pvp_virtio_user_2M_hugepages.py b/tests/TestSuite_pvp_virtio_user_2M_hugepages.py
index 5531e0b..a602eb8 100644
--- a/tests/TestSuite_pvp_virtio_user_2M_hugepages.py
+++ b/tests/TestSuite_pvp_virtio_user_2M_hugepages.py
@@ -77,12 +77,13 @@ class TestPVPVirtioWith2Mhuge(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.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.vhost_user = self.dut.new_session(suite="vhost-user")
         self.virtio_user = self.dut.new_session(suite="virtio-user")
@@ -131,9 +132,9 @@ class TestPVPVirtioWith2Mhuge(TestCase):
         """
         command_line_client = "%s/app/testpmd -c %s -n %d " + \
                               "--socket-mem 1024,1024 --file-prefix=vhost " + \
-                              "--vdev 'net_vhost0,iface=vhost-net,queues=1' -- -i"
+                              "--vdev 'net_vhost0,iface=%s/vhost-net,queues=1' -- -i"
         command_line_client = command_line_client % (self.target,
-                        self.core_mask_vhost_user, self.mem_channels)
+                        self.core_mask_vhost_user, self.mem_channels, self.base_dir)
         self.vhost_user.send_expect(command_line_client, "testpmd> ", 120)
         self.vhost_user.send_expect("start", "testpmd> ", 120)
 
@@ -144,9 +145,9 @@ class TestPVPVirtioWith2Mhuge(TestCase):
         command_line_user = "./%s/app/testpmd -n %d -c %s " + \
                             "--no-pci --socket-mem 1024,1024 " + \
                             "--file-prefix=virtio-user --single-file-segments " + \
-                            "--vdev=net_virtio_user0,mac=00:11:22:33:44:10,path=./vhost-net,queues=1 -- -i"
+                            "--vdev=net_virtio_user0,mac=00:11:22:33:44:10,path=%s/vhost-net,queues=1 -- -i"
         command_line_user = command_line_user % (self.target,
-                self.mem_channels, self.core_mask_virtio_user)
+                self.mem_channels, self.core_mask_virtio_user, self.base_dir)
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("start", "testpmd> ", 120)
 
-- 
2.17.2

[dts] [PATCH V1 13/17] tests/virtio_user_for_container_networking:vhost-net changed to absolute path

[zhuwenhui]

Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
 tests/TestSuite_virtio_user_for_container_networking.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_virtio_user_for_container_networking.py b/tests/TestSuite_virtio_user_for_container_networking.py
index 241d5b0..666554e 100644
--- a/tests/TestSuite_virtio_user_for_container_networking.py
+++ b/tests/TestSuite_virtio_user_for_container_networking.py
@@ -71,12 +71,13 @@ class TestVirtioUserForContainer(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.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.vhost_user = self.dut.new_session(suite='vhost-user')
         self.virtio_user = self.dut.new_session(suite='virtio-user')
@@ -138,10 +139,10 @@ class TestVirtioUserForContainer(TestCase):
         """
         command_line_client = self.dut.target + '/app/testpmd ' + \
                               '-c %s -n %d --socket-mem 1024,1024 --file-prefix=vhost ' + \
-                              '--vdev "net_vhost0,iface=vhost-net,queues=%d,client=0" ' + \
+                              '--vdev "net_vhost0,iface=%s/vhost-net,queues=%d,client=0" ' + \
                               '-- -i --nb-cores=%d'
         command_line_client = command_line_client % (self.core_mask_vhost_user,
-                                        self.mem_channels, self.queue_number,
+                                        self.mem_channels, self.base_dir, self.queue_number,
                                         self.nb_cores)
         self.vhost_user.send_expect(command_line_client, 'testpmd> ', 30)
         self.vhost_user.send_expect('start', 'testpmd> ', 30)
-- 
2.17.2

[dts] [PATCH V1 14/17] tests/pvp_vhost_user_reconnect:vhost-net changed to absolute path

[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

[dts] [PATCH V1 15/17] tests/pvp_virtio_bonding:vhost-net changed to absolute path

[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

[dts] [PATCH V1 16/17] tests/pvp_virtio_user_4k_pages:vhost-net changed to absolute path

[zhuwenhui]

Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu@intel.com>
---
 tests/TestSuite_pvp_virtio_user_4k_pages.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_pvp_virtio_user_4k_pages.py b/tests/TestSuite_pvp_virtio_user_4k_pages.py
index 11079a4..12ce6ad 100644
--- a/tests/TestSuite_pvp_virtio_user_4k_pages.py
+++ b/tests/TestSuite_pvp_virtio_user_4k_pages.py
@@ -81,12 +81,13 @@ class TestPVPVirtioWith2Mhuge(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.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.vhost_user = self.dut.new_session(suite="vhost-user")
         self.virtio_user = self.dut.new_session(suite="virtio-user")
@@ -133,10 +134,10 @@ class TestPVPVirtioWith2Mhuge(TestCase):
         """
         command_line_client = "%s/app/testpmd -c %s -n %d " + \
                               "--file-prefix=vhost  -m 1024 --no-huge " + \
-                              "--vdev 'net_vhost0,iface=vhost-net,queues=1' -- -i " + \
+                              "--vdev 'net_vhost0,iface=%s/vhost-net,queues=1' -- -i " + \
                               "--no-numa --socket-num=0"
         command_line_client = command_line_client % (self.target,
-                            self.core_mask_vhost_user, self.mem_channels)
+                            self.core_mask_vhost_user, self.mem_channels, self.base_dir)
         self.vhost_user.send_expect(command_line_client, "testpmd> ", 120)
         self.vhost_user.send_expect("start", "testpmd> ", 120)
 
@@ -146,9 +147,9 @@ class TestPVPVirtioWith2Mhuge(TestCase):
         """
         command_line_user = "./%s/app/testpmd -n %d -c %s " + \
                             "--no-huge -m 1024 --file-prefix=virtio-user " + \
-                            "--vdev=net_virtio_user0,mac=00:11:22:33:44:10,path=./vhost-net,queues=1 -- -i"
+                            "--vdev=net_virtio_user0,mac=00:11:22:33:44:10,path=%s/vhost-net,queues=1 -- -i"
         command_line_user = command_line_user % (self.target,
-                self.mem_channels, self.core_mask_virtio_user)
+                self.mem_channels, self.core_mask_virtio_user, self.base_dir)
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("start", "testpmd> ", 120)
 
-- 
2.17.2

[dts] [PATCH V1 17/17] tests/virtio_pvp_regression:vhost-net changed to absolute path

[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..f4682b1 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