aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--testcases/testcase.py4
-rw-r--r--vnfs/qemu/qemu.py2
-rw-r--r--vnfs/qemu/qemu_dpdk_vhost_cuse.py10
3 files changed, 4 insertions, 12 deletions
diff --git a/testcases/testcase.py b/testcases/testcase.py
index ff1247fc..7c935792 100644
--- a/testcases/testcase.py
+++ b/testcases/testcase.py
@@ -309,8 +309,10 @@ class TestCase(object):
# copy sources into shared dir only if neccessary
if 'testpmd' in self.guest_loopback or 'l2fwd' in self.guest_loopback:
try:
+ # always use DPDK vhost user version inside VM, so results are not
+ # affected by different testpmd behavior inside VM
tasks.run_task(['rsync', '-a', '-r', '-l', r'--exclude="\.git"',
- os.path.join(S.getValue('RTE_SDK'), ''),
+ os.path.join(S.getValue('RTE_SDK_USER'), ''),
os.path.join(guest_dir, 'DPDK')],
self._logger,
'Copying DPDK to shared directory...',
diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py
index 686fb431..c735062f 100644
--- a/vnfs/qemu/qemu.py
+++ b/vnfs/qemu/qemu.py
@@ -251,7 +251,7 @@ class IVnfQemu(IVnf):
def _modify_dpdk_makefile(self):
"""
- Modifies DPDK makefile in Guest before compilation
+ Modifies DPDK makefile in Guest before compilation if needed
"""
pass
diff --git a/vnfs/qemu/qemu_dpdk_vhost_cuse.py b/vnfs/qemu/qemu_dpdk_vhost_cuse.py
index e5a5e823..ab4fec84 100644
--- a/vnfs/qemu/qemu_dpdk_vhost_cuse.py
+++ b/vnfs/qemu/qemu_dpdk_vhost_cuse.py
@@ -56,13 +56,3 @@ class QemuDpdkVhostCuse(IVnfQemu):
',netdev=' + net2 + ',csum=off,gso=off,' +
'guest_tso4=off,guest_tso6=off,guest_ecn=off',
]
-
- # helper functions
-
- def _modify_dpdk_makefile(self):
- """
- Modifies DPDK makefile in Guest before compilation
- """
- self.execute_and_wait("sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=n/" +
- "CONFIG_RTE_LIBRTE_VHOST_USER=y/g'" +
- "config/common_linuxapp")