ixia: Fix VLAN support by IxNet class

[vswitchperf.git] / vswitches / ovs_vanilla.py

diff --git a/vswitches/ovs_vanilla.py b/vswitches/ovs_vanilla.py
index a6b720a..75870ab 100644 (file)
--- a/vswitches/ovs_vanilla.py
+++ b/vswitches/ovs_vanilla.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Intel Corporation.
+# Copyright 2015-2017 Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import logging
 from conf import settings
 from vswitches.ovs import IVSwitchOvs
 from src.ovs import DPCtl
-from tools.module_manager import ModuleManager
 from tools import tasks
 
 class OvsVanilla(IVSwitchOvs):
@@ -41,17 +40,6 @@ class OvsVanilla(IVSwitchOvs):
         self._logger = logging.getLogger(__name__)
         self._vswitchd_args += ["unix:%s" % self.get_db_sock_path()]
         self._vswitchd_args += settings.getValue('VSWITCHD_VANILLA_ARGS')
-        self._expect = "db.sock: connected"
-        self._module_manager = ModuleManager()
-
-    def start(self):
-        """See IVswitch for general description
-
-        Activates kernel modules, ovsdb and vswitchd.
-        """
-        self._module_manager.insert_modules(
-            settings.getValue('VSWITCH_VANILLA_KERNEL_MODULES'))
-        super(OvsVanilla, self).start()
 
     def stop(self):
         """See IVswitch for general description
@@ -61,9 +49,12 @@ class OvsVanilla(IVSwitchOvs):
         # remove all tap interfaces
         for i in range(self._vport_id):
             tapx = 'tap' + str(i)
-            tasks.run_task(['sudo', 'ip', 'tuntap', 'del',
-                            tapx, 'mode', 'tap'],
-                           self._logger, 'Deleting ' + tapx, False)
+            tap_cmd_list = ['sudo', 'ip', 'tuntap', 'del', tapx, 'mode', 'tap']
+            # let's assume, that all VMs have NIC QUEUES enabled or disabled
+            # at the same time
+            if int(settings.getValue('GUEST_NIC_QUEUES')[0]):
+                tap_cmd_list += ['multi_queue']
+            tasks.run_task(tap_cmd_list, self._logger, 'Deleting ' + tapx, False)
         self._vport_id = 0
 
         super(OvsVanilla, self).stop()
@@ -72,7 +63,6 @@ class OvsVanilla(IVSwitchOvs):
 
         self._module_manager.remove_modules()
 
-
     def add_phy_port(self, switch_name):
         """
         Method adds port based on detected device names.
@@ -83,8 +73,7 @@ class OvsVanilla(IVSwitchOvs):
             self._logger.error("Can't add port! There are only " +
                                len(self._ports) + " ports " +
                                "defined in config!")
-            raise
-
+            raise RuntimeError('Failed to add phy port')
         if not self._ports[self._current_id]:
             self._logger.error("Can't detect device name for NIC %s", self._current_id)
             raise ValueError("Invalid device name for %s" % self._current_id)
@@ -94,8 +83,10 @@ class OvsVanilla(IVSwitchOvs):
         params = []
 
         # For PVP only
-        tasks.run_task(['sudo', 'ifconfig', port_name, '0'],
+        tasks.run_task(['sudo', 'ip', 'addr', 'flush', 'dev', port_name],
                        self._logger, 'Remove IP', False)
+        tasks.run_task(['sudo', 'ip', 'link', 'set', 'dev', port_name, 'up'],
+                       self._logger, 'Bring up ' + port_name, False)
 
         of_port = bridge.add_port(port_name, params)
         self._current_id += 1
@@ -110,20 +101,42 @@ class OvsVanilla(IVSwitchOvs):
         # Create tap devices for the VM
         tap_name = 'tap' + str(self._vport_id)
         self._vport_id += 1
-
-        tasks.run_task(['sudo', 'ip', 'tuntap', 'del',
-                        tap_name, 'mode', 'tap'],
-                       self._logger, 'Creating tap device...', False)
-
-        tasks.run_task(['sudo', 'ip', 'tuntap', 'add',
-                        tap_name, 'mode', 'tap'],
-                       self._logger, 'Creating tap device...', False)
-
-        tasks.run_task(['sudo', 'ifconfig', tap_name, '0'],
+        tap_cmd_list = ['sudo', 'ip', 'tuntap', 'del', tap_name, 'mode', 'tap']
+        # let's assume, that all VMs have NIC QUEUES enabled or disabled
+        # at the same time
+        if int(settings.getValue('GUEST_NIC_QUEUES')[0]):
+            tap_cmd_list += ['multi_queue']
+        tasks.run_task(tap_cmd_list, self._logger,
+                       'Creating tap device...', False)
+
+        tap_cmd_list = ['sudo', 'ip', 'tuntap', 'add', tap_name, 'mode', 'tap']
+        # let's assume, that all VMs have NIC QUEUES enabled or disabled
+        # at the same time
+        if int(settings.getValue('GUEST_NIC_QUEUES')[0]):
+            tap_cmd_list += ['multi_queue']
+        tasks.run_task(tap_cmd_list, self._logger,
+                       'Creating tap device...', False)
+
+        tasks.run_task(['sudo', 'ip', 'addr', 'flush', 'dev', tap_name],
+                       self._logger, 'Remove IP', False)
+        tasks.run_task(['sudo', 'ip', 'link', 'set', 'dev', tap_name, 'up'],
                        self._logger, 'Bring up ' + tap_name, False)
 
         bridge = self._bridges[switch_name]
         of_port = bridge.add_port(tap_name, [])
         return (tap_name, of_port)
 
+    def add_connection(self, switch_name, port1, port2, bidir=False):
+        """See IVswitch for general description
+        """
+        raise NotImplementedError()
+
+    def del_connection(self, switch_name, port1, port2, bidir=False):
+        """See IVswitch for general description
+        """
+        raise NotImplementedError()
 
+    def dump_connections(self, switch_name):
+        """See IVswitch for general description
+        """
+        raise NotImplementedError()