Vanilla OVS support implementation

JIRA: VSPERF-57

This patch implements Vanilla OVS support.It contains:
* New IVswitch implementation: OvsVanilla,
* New configuration contants,
* New mandatory configuration variable: VSWITCH_VANILLA_PHY_PORT_NAMES
for Vanilla OVS has been added,
* Virtual ports are not yet implemented,
* Some kernel modules wrapping methods has been moved from dpdk.py to
tools.
* Fixed bug where ovsdb hasn't been killed at the end of test case run on
some platforms.

Change-Id: I21a0d84dbc4004aae564d5547387a2563f2d1e5b
Signed-off-by: Michal Weglicki <michalx.weglicki@intel.com>
Reviewed-by: Eugene Snider <Eugene.Snider@huawei.com>
Reviewed-by: Gurpreet Singh <gurpreet.singh@spirent.com>
Reviewed-by: Tv Rao <tv.rao@freescale.com>
Reviewed-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Billy O Mahony <billy.o.mahony@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>

2 files changed, 29 insertions, 29 deletions

diff --git a/src/dpdk/dpdk.py b/src/dpdk/dpdk.py
index 9b3d1385..01e1fb61 100644
--- a/src/dpdk/dpdk.py
+++ b/src/dpdk/dpdk.py
@@ -27,11 +27,14 @@ import locale
 
 from tools import tasks
 from conf import settings
+from tools.module_manager import ModuleManager, KernelModuleInsertMode
 
 _LOGGER = logging.getLogger(__name__)
 RTE_PCI_TOOL = os.path.join(
     settings.getValue('RTE_SDK'), 'tools', 'dpdk_nic_bind.py')
 
+_DPDK_MODULE_MANAGER = ModuleManager(KernelModuleInsertMode.MODPROBE)
+
 #
 # system management
 #
@@ -192,16 +195,8 @@ def _is_module_inserted(module):
 def _insert_modules():
     """Ensure required modules are inserted on system.
     """
-    for module in settings.getValue('SYS_MODULES'):
-        if _is_module_inserted(module):
-            continue
 
-        try:
-            tasks.run_task(['sudo', 'modprobe', module], _LOGGER,
-                           'Inserting module \'%s\'...' % module, True)
-        except subprocess.CalledProcessError:
-            _LOGGER.error('Unable to insert module \'%s\'.', module)
-            raise  # fail catastrophically
+    _DPDK_MODULE_MANAGER.insert_modules(settings.getValue('SYS_MODULES'))
 
     mod_path_prefix = settings.getValue('OVS_DIR')
     _insert_module_group('OVS_MODULES', mod_path_prefix)
@@ -237,18 +232,7 @@ def _remove_modules():
     _remove_module_group('OVS_MODULES')
     _remove_module_group('DPDK_MODULES')
 
-    for module in settings.getValue('SYS_MODULES'):
-        # first check if module is loaded
-        if not _is_module_inserted(module):
-            continue
-
-        try:
-            tasks.run_task(['sudo', 'rmmod', module], _LOGGER,
-                           'Removing module \'%s\'...' % module, True)
-        except subprocess.CalledProcessError:
-            _LOGGER.error('Unable to remove module \'%s\'.', module)
-            continue
-
+    _DPDK_MODULE_MANAGER.remove_modules()
 
 def _remove_module_group(module_group):
     """Ensure all modules in a group are removed from the system.
diff --git a/src/ovs/daemon.py b/src/ovs/daemon.py
index 323644c6..db096353 100644
--- a/src/ovs/daemon.py
+++ b/src/ovs/daemon.py
@@ -44,12 +44,12 @@ class VSwitchd(tasks.Process):
     """
     _ovsdb_pid = None
     _logfile = _LOG_FILE_VSWITCHD
+    _ovsdb_pidfile_path = os.path.join(settings.getValue('LOG_DIR'),
+                                    "ovsdb_pidfile.pid")
 
-
-    _expect = r'EAL: Master l*core \d+ is ready'
     _proc_name = 'ovs-vswitchd'
 
-    def __init__(self, timeout=30, vswitchd_args=None):
+    def __init__(self, timeout=30, vswitchd_args=None, expected_cmd=None):
         """Initialise the wrapper with a specific start timeout and extra
         parameters.
 
@@ -60,8 +60,8 @@ class VSwitchd(tasks.Process):
         """
         self._logger = logging.getLogger(__name__)
         self._timeout = timeout
+        self._expect = expected_cmd;
         vswitchd_args = vswitchd_args or []
-
         self._cmd = ['sudo', '-E', _OVS_VSWITCHD_BIN] + vswitchd_args
 
     # startup/shutdown
@@ -72,6 +72,7 @@ class VSwitchd(tasks.Process):
         :returns: None
         :raises: pexpect.EOF, pexpect.TIMEOUT
         """
+
         self._reset_ovsdb()
         self._start_ovsdb()  # this has to be started first
 
@@ -79,6 +80,7 @@ class VSwitchd(tasks.Process):
             super(VSwitchd, self).start()
             self.relinquish()
         except (pexpect.EOF, pexpect.TIMEOUT) as exc:
+            logging.error("Exception during VSwitch start.")
             self._kill_ovsdb()
             raise exc
 
@@ -125,10 +127,11 @@ class VSwitchd(tasks.Process):
                        self._logger,
                        'Creating ovsdb configuration database...')
 
-        self._ovsdb_pid = tasks.run_background_task(
+        tasks.run_background_task(
             ['sudo', _OVSDB_SERVER_BIN,
              '--remote=punix:%s' % os.path.join(_OVS_VAR_DIR, 'db.sock'),
-             '--remote=db:Open_vSwitch,Open_vSwitch,manager_options'],
+             '--remote=db:Open_vSwitch,Open_vSwitch,manager_options',
+             '--pidfile=' + self._ovsdb_pidfile_path , '--overwrite-pidfile'],
             self._logger,
             'Starting ovsdb-server...')
 
@@ -137,6 +140,19 @@ class VSwitchd(tasks.Process):
 
         :returns: None
         """
-        if self._ovsdb_pid:
-            tasks.run_task(['sudo', 'kill', '-15', str(self._ovsdb_pid)],
+        with open (self._ovsdb_pidfile_path, "r") as pidfile:
+            ovsdb_pid = pidfile.read().strip()
+
+        self._logger.info("Killing ovsdb with pid: " + ovsdb_pid)
+
+        if ovsdb_pid:
+            tasks.run_task(['sudo', 'kill', '-15', str(ovsdb_pid)],
                            self._logger, 'Killing ovsdb-server...')
+
+    @staticmethod
+    def getDbSockPath():
+        """Method returns location of db.sock file
+
+        :returns: path to db.sock file.
+        """
+        return os.path.join(_OVS_VAR_DIR, 'db.sock')