diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2016-07-26 12:16:17 +0100 |
|---|---|---|
| committer | Martin Klozik <martinx.klozik@intel.com> | 2016-07-26 12:22:02 +0100 |
| commit | 49c477226c80bbe7350ddfc77c118d0b8aee0547 (patch) | |
| tree | 6075b8807a5ad6f81ba4a18c5f22dd56530800f8 /vnfs | |
| parent | 891488bb5e0047c7062198a9241511c7fcedeb6f (diff) | |
dpdk: Support of DPDK16.07-rc5 and newer
DPDK 16.07-rc5 has renamed script tools/dpdk_nic_bind.py
to tools/dpdk-devbind.py. VSPERF was updated to use wildcard
in the script name, which is backward compatible.
Function get_version() from tools/systeminfo was updated
to correctly parse version information for DPDK v16. Version
name includes a minor version as defined inside rte_version.h.
It means, that for tag v16.07-rc5 VSPERF will show v16.07.0-rc5
in the report.
JIRA: VSPERF-333
Change-Id: I61a4ab2d90304fffdfc4d22a5cbf0cb7295402b3
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: <bmichalo@redhat.com>
Diffstat (limited to 'vnfs')
| -rw-r--r-- | vnfs/qemu/qemu.py | 8 | ||||
| -rw-r--r-- | vnfs/qemu/qemu_pci_passthrough.py | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py index 9382edef..02ada4b5 100644 --- a/vnfs/qemu/qemu.py +++ b/vnfs/qemu/qemu.py @@ -338,16 +338,16 @@ class IVnfQemu(IVnf): self.execute_and_wait('modprobe uio') self.execute_and_wait('insmod %s/kmod/igb_uio.ko' % S.getValue('RTE_TARGET')) - self.execute_and_wait('./tools/dpdk_nic_bind.py --status') + self.execute_and_wait('./tools/dpdk*bind.py --status') self.execute_and_wait( - './tools/dpdk_nic_bind.py -u' ' ' + + './tools/dpdk*bind.py -u' ' ' + S.getValue('GUEST_NET1_PCI_ADDRESS')[self._number] + ' ' + S.getValue('GUEST_NET2_PCI_ADDRESS')[self._number]) self.execute_and_wait( - './tools/dpdk_nic_bind.py -b igb_uio' ' ' + + './tools/dpdk*bind.py -b igb_uio' ' ' + S.getValue('GUEST_NET1_PCI_ADDRESS')[self._number] + ' ' + S.getValue('GUEST_NET2_PCI_ADDRESS')[self._number]) - self.execute_and_wait('./tools/dpdk_nic_bind.py --status') + self.execute_and_wait('./tools/dpdk*bind.py --status') # build and run 'test-pmd' self.execute_and_wait('cd ' + S.getValue('GUEST_OVS_DPDK_DIR') + diff --git a/vnfs/qemu/qemu_pci_passthrough.py b/vnfs/qemu/qemu_pci_passthrough.py index 1b55fdf2..14810f0a 100644 --- a/vnfs/qemu/qemu_pci_passthrough.py +++ b/vnfs/qemu/qemu_pci_passthrough.py @@ -19,6 +19,7 @@ import logging import subprocess import os +import glob from conf import settings as S from vnfs.qemu.qemu import IVnfQemu @@ -26,7 +27,7 @@ from tools import tasks from tools.module_manager import ModuleManager _MODULE_MANAGER = ModuleManager() -_RTE_PCI_TOOL = os.path.join(S.getValue('RTE_SDK'), 'tools', 'dpdk_nic_bind.py') +_RTE_PCI_TOOL = glob.glob(os.path.join(S.getValue('RTE_SDK'), 'tools', 'dpdk*bind.py'))[0] class QemuPciPassthrough(IVnfQemu): """ |