paths: Support binary packages

Currently VSPERF supports OVS, DPDK and QEMU built
from the source code only. In some cases it is required
to support installation of these tools from binary packages
available for given linux distribution. Thus VSPERF
configuration and code was modified to suport both source
and binary versions of tools. This can be configured perf
tool, so various combinations of source and binary version
are supported.
Together with new configuration also a handling of kernel
modules was modified to automatically detect and load module
dependencies.

JIRA: VSPERF-340
JIRA: VSPERF-339

Change-Id: I855cb438cbd8998bdc499613ea5e7de2526299d7
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: Bill Michalowski <bmichalo@redhat.com>
Reviewed-by: Otto Sabart <osabart@redhat.com>

2 files changed, 11 insertions, 46 deletions

diff --git a/src/dpdk/dpdk.py b/src/dpdk/dpdk.py
index bd9bb9cf..16223915 100644
--- a/src/dpdk/dpdk.py
+++ b/src/dpdk/dpdk.py
@@ -25,13 +25,11 @@ import subprocess
 import logging
 import glob
 
-from conf import settings
+from conf import settings as S
 from tools import tasks
 from tools.module_manager import ModuleManager
 
 _LOGGER = logging.getLogger(__name__)
-RTE_PCI_TOOL = glob.glob(os.path.join(
-    settings.getValue('RTE_SDK_USER'), 'tools', 'dpdk*bind.py'))[0]
 
 _DPDK_MODULE_MANAGER = ModuleManager()
 
@@ -48,7 +46,7 @@ def init():
     """
     global _NICS
     global _NICS_PCI
-    _NICS = settings.getValue('NICS')
+    _NICS = S.getValue('NICS')
     _NICS_PCI = list(nic['pci'] for nic in _NICS)
     if not _is_linux():
         _LOGGER.error('Not running on a compatible Linux version. Exiting...')
@@ -91,18 +89,7 @@ def _insert_modules():
     """Ensure required modules are inserted on system.
     """
 
-    _DPDK_MODULE_MANAGER.insert_modules(settings.getValue('SYS_MODULES'))
-
-    mod_path_prefix = settings.getValue('OVS_DIR')
-    _DPDK_MODULE_MANAGER.insert_module_group(settings.getValue('OVS_MODULES'),
-                                             mod_path_prefix)
-    if 'vfio-pci' not in settings.getValue('DPDK_MODULES'):
-        mod_path_prefix = os.path.join(settings.getValue('RTE_SDK'),
-                                       settings.getValue('RTE_TARGET'))
-        _DPDK_MODULE_MANAGER.insert_module_group(settings.getValue('DPDK_MODULES'),
-                                                 mod_path_prefix)
-    else:
-        _DPDK_MODULE_MANAGER.insert_modules(settings.getValue('DPDK_MODULES'))
+    _DPDK_MODULE_MANAGER.insert_modules(S.getValue('TOOLS')['dpdk_modules'])
 
 def _remove_modules():
     """Ensure required modules are removed from system.
@@ -110,26 +97,6 @@ def _remove_modules():
     _DPDK_MODULE_MANAGER.remove_modules()
 
 #
-# vhost specific modules management
-#
-
-def insert_vhost_modules():
-    """Inserts VHOST related kernel modules
-    """
-    mod_path_prefix = os.path.join(settings.getValue('RTE_SDK'),
-                                   'lib',
-                                   'librte_vhost')
-    _DPDK_MODULE_MANAGER.insert_module_group(settings.getValue('VHOST_MODULE'), mod_path_prefix)
-
-
-def remove_vhost_modules():
-    """Removes all VHOST related kernel modules
-    """
-    # all modules are removed automatically by _remove_modules() method
-    pass
-
-
-#
 # 'vhost-net' module cleanup
 #
 
@@ -150,7 +117,8 @@ def _remove_vhost_net():
 def _vhost_user_cleanup():
     """Remove files created by vhost-user tests.
     """
-    for sock in glob.glob(settings.getValue('VHOST_USER_SOCKS')):
+    for sock in glob.glob(os.path.join(S.getValue('TOOLS')['ovs_var_tmp'],
+                                       S.getValue('VHOST_USER_SOCKS'))):
         if os.path.exists(sock):
             try:
                 tasks.run_task(['sudo', 'rm', sock],
@@ -173,7 +141,7 @@ def _bind_nics():
     """
     try:
         _driver = 'igb_uio'
-        if 'vfio-pci' in settings.getValue('DPDK_MODULES'):
+        if 'vfio-pci' in S.getValue('TOOLS')['dpdk_modules']:
             _driver = 'vfio-pci'
             tasks.run_task(['sudo', 'chmod', 'a+x', '/dev/vfio'],
                            _LOGGER, 'Setting VFIO permissions .. a+x',
@@ -182,7 +150,8 @@ def _bind_nics():
                            _LOGGER, 'Setting VFIO permissions .. 0666',
                            True)
 
-        tasks.run_task(['sudo', RTE_PCI_TOOL, '--bind=' + _driver] +
+        tasks.run_task(['sudo', S.getValue('TOOLS')['bind-tool'],
+                       '--bind=' + _driver] +
                        _NICS_PCI, _LOGGER,
                        'Binding NICs %s...' % _NICS_PCI,
                        True)
@@ -193,7 +162,7 @@ def _unbind_nics():
     """Unbind NICs using the Intel DPDK ``dpdk*bind.py`` tool.
     """
     try:
-        tasks.run_task(['sudo', RTE_PCI_TOOL, '--unbind'] +
+        tasks.run_task(['sudo', S.getValue('TOOLS')['bind-tool'], '--unbind'] +
                        _NICS_PCI, _LOGGER,
                        'Unbinding NICs %s...' % str(_NICS_PCI),
                        True)
@@ -204,7 +173,7 @@ def _unbind_nics():
     for nic in _NICS:
         try:
             if nic['driver']:
-                tasks.run_task(['sudo', RTE_PCI_TOOL, '--bind',
+                tasks.run_task(['sudo', S.getValue('TOOLS')['bind-tool'], '--bind',
                                 nic['driver'], nic['pci']],
                                _LOGGER, 'Binding NIC %s to %s...' %
                                (nic['pci'], nic['driver']),
diff --git a/src/dpdk/testpmd_proc.py b/src/dpdk/testpmd_proc.py
index 990ef8da..a8fa8eee 100644
--- a/src/dpdk/testpmd_proc.py
+++ b/src/dpdk/testpmd_proc.py
@@ -27,10 +27,6 @@ from tools import tasks
 
 _TESTPMD_PROMPT = 'Done'
 
-_TESTPMD_BIN = os.path.join(
-    settings.getValue('RTE_SDK'), settings.getValue('RTE_TARGET'),
-    'app', 'testpmd')
-
 _LOG_FILE_VSWITCHD = os.path.join(
     settings.getValue('LOG_DIR'), settings.getValue('LOG_FILE_VSWITCHD'))
 
@@ -57,7 +53,7 @@ class TestPMDProcess(tasks.Process):
         if not self._expect:
             self._expect = _TESTPMD_PROMPT
         testpmd_args = testpmd_args or []
-        self._cmd = ['sudo', '-E', _TESTPMD_BIN] + testpmd_args
+        self._cmd = ['sudo', '-E', settings.getValue('TOOLS')['testpmd']] + testpmd_args
 
     # startup/shutdown