connections: Introduction of generic API

Redesign of vSwitch and vSwitch controller classes, to use generic
connection methods for configuration of vSwitch. This API
is more generic and vSwitch agnostic, thus deployment scenarios like
P2P, PVP, PVVP (i.e. PVVPx) can be used for all (currently)
supported vSwitches. Usage of new API will simplify an introduction
of new vSwitches in the future.

This patchset introduces following changes:
* OVS: implementation of add_, del_, dump_ connection(s) and their
  validation methods
* VPP: bidir parameter removed - it is up to the deployment scenario
  implementation to take care about bidirectional connections
* P2P and PXP controllers were updated to use connection methods
  instead of flow related methods. Thus standard TCs will support
  both OVS and VPP. NOTE, PVPV is not supported for VPP (yet?).
* refactoring of vSwitch interfaces and inherited classes
* VPP step driven TCs were replaced by standard TCs with appropriate
  deployment scenarios. This is for backward compatibility with
  TC reporting. Once reporting of VPP TC results into results DB will be
  modified, this TCs can be removed.
* OVS routing tables support was generalized to support P2P and
  PXP deployments and step driven TCs. Usage of OVS routing tables
  is now configurable (turned off by default) for better comparison of
  results among various vSwitches.
* Multistream pre_installed_flows feature was generalized to
  support P2P and PXP deployments and step driven TCs.
* IxNet: TRAFFIC['l4']['dstport'] will be used as a start value for port
  iteration if L4 multistream feature is enabled.
* OVS: default flow template is now configurable via OVS_FLOW_TEMPLATE
* OVS: support of TRAFFIC['flow_type']='ip' was generalized to work
  with connection methods (i.e. with P2P and PXP deployments and
  step driven TCs)
* integration TCs: modification of integration TCs and their macros to
  utilize new generic connection based API
* CI: list of TCs for VERIFY & MERGE jobs was changed to run
  the same generic tests for both OVS & VPP
* documentation update
* small fixes and improvements

JIRA: VSPERF-579

Change-Id: If4e6e6037929eab9f16c2bbcb8a0fb30e5d6f9b0
Signed-off-by: Martin Klozik <martin.klozik@tieto.com>
Reviewed-by: Richard Elias <richard.elias@tieto.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>

1 files changed, 27 insertions, 52 deletions

diff --git a/vswitches/vpp_dpdk_vhost.py b/vswitches/vpp_dpdk_vhost.py
index 15e32f32..5d676a01 100644
--- a/vswitches/vpp_dpdk_vhost.py
+++ b/vswitches/vpp_dpdk_vhost.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Intel Corporation.
+# Copyright 2017-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.
@@ -15,7 +15,6 @@
 """VSPERF VPP implementation using DPDK and vhostuser vports
 """
 
-import logging
 import os
 import copy
 import re
@@ -37,19 +36,13 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
     def __init__(self):
         """See IVswitch for general description
         """
+        super().__init__()
         self._logfile = os.path.join(S.getValue('LOG_DIR'),
                                      S.getValue('LOG_FILE_VPP'))
-        self._logger = logging.getLogger(__name__)
         self._expect = r'vpp#'
-        self._timeout = 30
-        self._vswitch_args = []
-        self._cmd = []
         self._cmd_template = ['sudo', '-E', S.getValue('TOOLS')['vpp']]
-        self._stamp = None
-        self._logger = logging.getLogger(__name__)
         self._phy_ports = []
         self._virt_ports = []
-        self._switches = {}
         self._vpp_ctl = ['sudo', S.getValue('TOOLS')['vppctl']]
 
         # configure DPDK NICs
@@ -151,7 +144,7 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
             tasks.Process.start(self)
             self.relinquish()
         except (pexpect.EOF, pexpect.TIMEOUT) as exc:
-            logging.error("Exception during VPP start.")
+            self._logger.error("Exception during VPP start.")
             raise exc
 
         self._logger.info("VPP...Started.")
@@ -269,21 +262,17 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
         else:
             self._logger.warning("Port %s is not configured.", port_name)
 
-    def add_l2patch(self, port1, port2, bidir=False):
+    def add_l2patch(self, port1, port2):
         """Create l2patch connection between given ports
         """
         self.run_vppctl(['test', 'l2patch', 'rx', port1, 'tx', port2])
-        if bidir:
-            self.run_vppctl(['test', 'l2patch', 'rx', port2, 'tx', port1])
 
-    def add_xconnect(self, port1, port2, bidir=False):
+    def add_xconnect(self, port1, port2):
         """Create l2patch connection between given ports
         """
         self.run_vppctl(['set', 'interface', 'l2', 'xconnect', port1, port2])
-        if bidir:
-            self.run_vppctl(['set', 'interface', 'l2', 'xconnect', port2, port1])
 
-    def add_bridge(self, switch_name, port1, port2, _dummy_bidir=False):
+    def add_bridge(self, switch_name, port1, port2):
         """Add given ports to bridge ``switch_name``
         """
         self.run_vppctl(['set', 'interface', 'l2', 'bridge', port1,
@@ -291,33 +280,33 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
         self.run_vppctl(['set', 'interface', 'l2', 'bridge', port2,
                          str(self._switches[switch_name])])
 
-    def add_connection(self, switch_name, port1, port2, bidir=False):
+    def add_connection(self, switch_name, port1, port2, traffic=None):
         """See IVswitch for general description
 
         :raises: RuntimeError
         """
+        if traffic:
+            self._logger.warning("VPP add_connection() does not support 'traffic' options.")
+
         mode = S.getValue('VSWITCH_VPP_L2_CONNECT_MODE')
         if mode == 'l2patch':
-            self.add_l2patch(port1, port2, bidir)
+            self.add_l2patch(port1, port2)
         elif mode == 'xconnect':
-            self.add_xconnect(port1, port2, bidir)
+            self.add_xconnect(port1, port2)
         elif mode == 'bridge':
             self.add_bridge(switch_name, port1, port2)
         else:
             raise RuntimeError('VPP: Unsupported l2 connection mode detected %s' % mode)
 
-    def del_l2patch(self, port1, port2, bidir=False):
+    def del_l2patch(self, port1, port2):
         """Remove l2patch connection between given ports
 
         :param port1: port to be used in connection
         :param port2: port to be used in connection
-        :param bidir: switch between uni and bidirectional traffic
         """
         self.run_vppctl(['test', 'l2patch', 'rx', port1, 'tx', port2, 'del'])
-        if bidir:
-            self.run_vppctl(['test', 'l2patch', 'rx', port2, 'tx', port1, 'del'])
 
-    def del_xconnect(self, port1, port2, _dummy_bidir=False):
+    def del_xconnect(self, port1, port2):
         """Remove xconnect connection between given ports
         """
         self.run_vppctl(['set', 'interface', 'l3', port1])
@@ -329,20 +318,21 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
         self.run_vppctl(['set', 'interface', 'l3', port1])
         self.run_vppctl(['set', 'interface', 'l3', port2])
 
-    def del_connection(self, switch_name, port1, port2, bidir=False):
+    def del_connection(self, switch_name, port1=None, port2=None):
         """See IVswitch for general description
 
         :raises: RuntimeError
         """
-        mode = S.getValue('VSWITCH_VPP_L2_CONNECT_MODE')
-        if mode == 'l2patch':
-            self.del_l2patch(port1, port2, bidir)
-        elif mode == 'xconnect':
-            self.del_xconnect(port1, port2, bidir)
-        elif mode == 'bridge':
-            self.del_bridge(switch_name, port1, port2)
-        else:
-            raise RuntimeError('VPP: Unsupported l2 connection mode detected %s' % mode)
+        if port1 and port2:
+            mode = S.getValue('VSWITCH_VPP_L2_CONNECT_MODE')
+            if mode == 'l2patch':
+                self.del_l2patch(port1, port2)
+            elif mode == 'xconnect':
+                self.del_xconnect(port1, port2)
+            elif mode == 'bridge':
+                self.del_bridge(switch_name, port1, port2)
+            else:
+                raise RuntimeError('VPP: Unsupported l2 connection mode detected %s' % mode)
 
     def dump_l2patch(self):
         """Dump l2patch connections
@@ -417,13 +407,13 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
 
     # pylint: disable=no-self-use
     def validate_add_connection(self, _dummy_result, _dummy_switch_name, _dummy_port1,
-                                _dummy_port2, _dummy_bidir=False):
+                                _dummy_port2, _dummy_traffic=None):
         """ Validate that connection was added
         """
         return True
 
     def validate_del_connection(self, _dummy_result, _dummy_switch_name, _dummy_port1,
-                                _dummy_port2, _dummy_bidir=False):
+                                _dummy_port2):
         """ Validate that connection was deleted
         """
         return True
@@ -442,21 +432,6 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
     #
     # Non implemented methods
     #
-    def add_flow(self, switch_name, flow, cache='off'):
-        """See IVswitch for general description
-        """
-        raise NotImplementedError()
-
-    def del_flow(self, switch_name, flow=None):
-        """See IVswitch for general description
-        """
-        raise NotImplementedError()
-
-    def dump_flows(self, switch_name):
-        """See IVswitch for general description
-        """
-        raise NotImplementedError()
-
     def add_route(self, switch_name, network, destination):
         """See IVswitch for general description
         """