Enable PVP and PVVP deployments for Vanilla OVS

[vswitchperf.git] / core / vswitch_controller_pvp.py

diff --git a/core/vswitch_controller_pvp.py b/core/vswitch_controller_pvp.py
index 8c409dc..b2337bd 100644 (file)
--- a/core/vswitch_controller_pvp.py
+++ b/core/vswitch_controller_pvp.py
@@ -19,11 +19,11 @@ import logging
 
 from core.vswitch_controller import IVswitchController
 from vswitches.utils import add_ports_to_flow
+from conf import settings
 
 _FLOW_TEMPLATE = {
     'idle_timeout': '0'
 }
-BRIDGE_NAME = 'br0'
 
 class VswitchControllerPVP(IVswitchController):
     """VSwitch controller for PVP deployment scenario.
@@ -54,28 +54,29 @@ class VswitchControllerPVP(IVswitchController):
         try:
             self._vswitch.start()
 
-            self._vswitch.add_switch(BRIDGE_NAME)
+            bridge = settings.getValue('VSWITCH_BRIDGE_NAME')
+            self._vswitch.add_switch(bridge)
 
-            (_, phy1_number) = self._vswitch.add_phy_port(BRIDGE_NAME)
-            (_, phy2_number) = self._vswitch.add_phy_port(BRIDGE_NAME)
-            (_, vport1_number) = self._vswitch.add_vport(BRIDGE_NAME)
-            (_, vport2_number) = self._vswitch.add_vport(BRIDGE_NAME)
+            (_, phy1_number) = self._vswitch.add_phy_port(bridge)
+            (_, phy2_number) = self._vswitch.add_phy_port(bridge)
+            (_, vport1_number) = self._vswitch.add_vport(bridge)
+            (_, vport2_number) = self._vswitch.add_vport(bridge)
 
-            self._vswitch.del_flow(BRIDGE_NAME)
+            self._vswitch.del_flow(bridge)
             flow1 = add_ports_to_flow(_FLOW_TEMPLATE, phy1_number,
                                       vport1_number)
             flow2 = add_ports_to_flow(_FLOW_TEMPLATE, vport2_number,
                                       phy2_number)
-            self._vswitch.add_flow(BRIDGE_NAME, flow1)
-            self._vswitch.add_flow(BRIDGE_NAME, flow2)
+            self._vswitch.add_flow(bridge, flow1)
+            self._vswitch.add_flow(bridge, flow2)
 
             if self._bidir:
                 flow3 = add_ports_to_flow(_FLOW_TEMPLATE, phy2_number,
                                           vport2_number)
                 flow4 = add_ports_to_flow(_FLOW_TEMPLATE, vport1_number,
                                           phy1_number)
-                self._vswitch.add_flow(BRIDGE_NAME, flow3)
-                self._vswitch.add_flow(BRIDGE_NAME, flow4)
+                self._vswitch.add_flow(bridge, flow3)
+                self._vswitch.add_flow(bridge, flow4)
 
         except:
             self._vswitch.stop()
@@ -102,4 +103,9 @@ class VswitchControllerPVP(IVswitchController):
         """See IVswitchController for description
         """
         self._logger.debug('get_ports_info  using ' + str(self._vswitch_class))
-        return self._vswitch.get_ports(BRIDGE_NAME)
+        return self._vswitch.get_ports(settings.getValue('VSWITCH_BRIDGE_NAME'))
+
+    def dump_vswitch_flows(self):
+        """See IVswitchController for description
+        """
+        self._vswitch.dump_flows(settings.getValue('VSWITCH_BRIDGE_NAME'))