connections: Introduction of generic API

[vswitchperf.git] / core / vswitch_controller_p2p.py

diff --git a/core/vswitch_controller_p2p.py b/core/vswitch_controller_p2p.py
index c15f7ef..d8f22e4 100644 (file)
--- a/core/vswitch_controller_p2p.py
+++ b/core/vswitch_controller_p2p.py
@@ -1,4 +1,4 @@
-# Copyright 2015 Intel Corporation.
+# Copyright 2015-2018 Intel Corporation., Tieto
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,16 +14,9 @@
 
 """VSwitch controller for Physical to Physical deployment
 """
-
-import logging
-
 from core.vswitch_controller import IVswitchController
 from conf import settings
 
-_FLOW_TEMPLATE = {
-    'idle_timeout': '0'
-}
-
 class VswitchControllerP2P(IVswitchController):
     """VSwitch controller for P2P deployment scenario.
 
@@ -33,61 +26,28 @@ class VswitchControllerP2P(IVswitchController):
         _deployment_scenario: A string describing the scenario to set-up in the
             constructor.
     """
-    def __init__(self, vswitch_class):
-        """Initializes up the prerequisites for the P2P deployment scenario.
-
-        :vswitch_class: the vSwitch class to be used.
+    def __init__(self, deployment, vswitch_class, traffic):
+        """See IVswitchController for general description
         """
-        self._logger = logging.getLogger(__name__)
-        self._vswitch_class = vswitch_class
-        self._vswitch = vswitch_class()
-        self._deployment_scenario = "P2P"
-        self._logger.debug('Creation using ' + str(self._vswitch_class))
+        super().__init__(deployment, vswitch_class, traffic)
+        self._bridge = settings.getValue('VSWITCH_BRIDGE_NAME')
 
     def setup(self):
         """Sets up the switch for p2p.
         """
-        self._logger.debug('Setup using ' + str(self._vswitch_class))
+        self._logger.debug('Setup using %s', str(self._vswitch_class))
 
         try:
             self._vswitch.start()
 
-            bridge = settings.getValue('VSWITCH_BRIDGE_NAME')
-            self._vswitch.add_switch(bridge)
-
-            (_, _) = self._vswitch.add_phy_port(bridge)
-            (_, _) = self._vswitch.add_phy_port(bridge)
-
-            self._vswitch.del_flow(bridge)
+            self._vswitch.add_switch(self._bridge)
 
-            # table#0 - flows designed to force 5 & 13 tuple matches go here
-            flow = {'table':'0', 'priority':'1', 'actions': ['goto_table:1']}
-            self._vswitch.add_flow(bridge, flow)
+            (port1, _) = self._vswitch.add_phy_port(self._bridge)
+            (port2, _) = self._vswitch.add_phy_port(self._bridge)
 
-            # table#1 - flows to route packets between ports goes here. The
-            # chosen port is communicated to subsequent tables by setting the
-            # metadata value to the egress port number
-            flow = {'table':'1', 'priority':'1', 'in_port':'1',
-                    'actions': ['write_actions(output:2)', 'write_metadata:2',
-                                'goto_table:2']}
-            self._vswitch.add_flow(bridge, flow)
-            flow = {'table':'1', 'priority':'1', 'in_port':'2',
-                    'actions': ['write_actions(output:1)', 'write_metadata:1',
-                                'goto_table:2']}
-            self._vswitch.add_flow(bridge, flow)
+            self._vswitch.add_connection(self._bridge, port1, port2, self._traffic)
+            self._vswitch.add_connection(self._bridge, port2, port1, self._traffic)
 
-            # Frame modification table. Frame modification flow rules are
-            # isolated in this table so that they can be turned on or off
-            # without affecting the routing or tuple-matching flow rules.
-            flow = {'table':'2', 'priority':'1', 'actions': ['goto_table:3']}
-            self._vswitch.add_flow(bridge, flow)
-
-            # Egress table
-            # (TODO) Billy O'Mahony - the drop action here actually required in
-            # order to egress the packet. This is the subject of a thread on
-            # ovs-discuss 2015-06-30.
-            flow = {'table':'3', 'priority':'1', 'actions': ['drop']}
-            self._vswitch.add_flow(bridge, flow)
         except:
             self._vswitch.stop()
             raise
@@ -95,22 +55,16 @@ class VswitchControllerP2P(IVswitchController):
     def stop(self):
         """Tears down the switch created in setup().
         """
-        self._logger.debug('Stop using ' + str(self._vswitch_class))
+        self._logger.debug('Stop using %s', str(self._vswitch_class))
         self._vswitch.stop()
 
-    def __enter__(self):
-        self.setup()
-
-    def __exit__(self, type_, value, traceback):
-        self.stop()
-
-    def get_vswitch(self):
+    def get_ports_info(self):
         """See IVswitchController for description
         """
-        return self._vswitch
+        self._logger.debug('get_ports_info  using %s', str(self._vswitch_class))
+        return self._vswitch.get_ports(self._bridge)
 
-    def get_ports_info(self):
+    def dump_vswitch_connections(self):
         """See IVswitchController for description
         """
-        self._logger.debug('get_ports_info  using ' + str(self._vswitch_class))
-        return self._vswitch.get_ports(settings.getValue('VSWITCH_BRIDGE_NAME'))
+        self._vswitch.dump_connections(self._bridge)