diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2016-05-09 09:48:30 +0100 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2016-05-12 12:50:46 +0100 |
| commit | 30d75a0778d825fa13eecea7d352eedfe35bd4ed (patch) | |
| tree | ead8f9ee566284261d545757a48c156fe19fd7ea /vnfs/qemu | |
| parent | 6c15bb9203da9a21bbf9cfcbb829d5bd58c70223 (diff) | |
dpdk: Support of DPDK v16.04
Configuration options modified by VSPERF were split
between config_base and config_linuxapp files. Makefile
was modified to reflect this change.
Additional changes:
* content of qemu shared dir is copied without preservation
of attributes to avoid compilation issues due misaligned
clocks => could produce broken igb_uio module
* added support of new testpmd "Bye.." message
* DPDK sources are copied from RTE_SDK_USER directory for all
VNF variants - this has been wrongly reverted by inttest patch
Change-Id: Id502a072c1f843258496decbf031e7ba7264d459
JIRA: VSPERF-297
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Reviewed-by: Michal Weglicki <michalx.weglicki@intel.com>
Diffstat (limited to 'vnfs/qemu')
| -rw-r--r-- | vnfs/qemu/qemu.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py index d108dc9a..87f77583 100644 --- a/vnfs/qemu/qemu.py +++ b/vnfs/qemu/qemu.py @@ -138,7 +138,7 @@ class IVnfQemu(IVnf): # exit testpmd if needed if self._guest_loopback == 'testpmd': self.execute_and_wait('stop', 120, "Done") - self.execute_and_wait('quit', 120, "bye") + self.execute_and_wait('quit', 120, "[bB]ye") # turn off VM self.execute_and_wait('poweroff', 120, "Power down") @@ -276,7 +276,7 @@ class IVnfQemu(IVnf): self.execute_and_wait('mount -o ro,iocharset=utf8 /dev/sdb1 ' + S.getValue('OVS_DPDK_SHARE')) self.execute_and_wait('mkdir -p ' + S.getValue('GUEST_OVS_DPDK_DIR')) - self.execute_and_wait('cp -ra ' + os.path.join(S.getValue('OVS_DPDK_SHARE'), dirname) + + self.execute_and_wait('cp -r ' + os.path.join(S.getValue('OVS_DPDK_SHARE'), dirname) + ' ' + S.getValue('GUEST_OVS_DPDK_DIR')) self.execute_and_wait('umount /dev/sdb1') |