From b55c8beb6003f07f025fc0edbc08c3e0fcaed064 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Tue, 23 Feb 2016 09:54:43 +0000 Subject: integration: Support of integration testcases Generic support for integration testcases with first set of tests for vswitch testing. New test option "TestSteps" has been introduced to define test step by step directly in configuration file. In case that this concept will be accepted, there are plenty of possibilities for future improvements. For example: * use it also for performance tests without explicit call of validation methods * introduce step macros for repetitive scenarios, so new tests can be easily written * further generalization, which would go beyond usage of controllers and will operate directly with vswitch, vnf and trafficgen objects Change-Id: Ifad166c8ef9cfbda6694682fe6b3421e0e97bbf2 JIRA: VSPERF-212 Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Brian Castelli --- core/component_factory.py | 3 ++ core/traffic_controller_rfc2544.py | 13 +++++++ core/vswitch_controller_clean.py | 79 ++++++++++++++++++++++++++++++++++++++ core/vswitch_controller_p2p.py | 4 +- 4 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 core/vswitch_controller_clean.py (limited to 'core') diff --git a/core/component_factory.py b/core/component_factory.py index cb5af211..9c58fc5c 100644 --- a/core/component_factory.py +++ b/core/component_factory.py @@ -16,6 +16,7 @@ """ from core.traffic_controller_rfc2544 import TrafficControllerRFC2544 +from core.vswitch_controller_clean import VswitchControllerClean from core.vswitch_controller_p2p import VswitchControllerP2P from core.vswitch_controller_pvp import VswitchControllerPVP from core.vswitch_controller_pvvp import VswitchControllerPVVP @@ -72,6 +73,8 @@ def create_vswitch(deployment_scenario, vswitch_class, traffic, return VswitchControllerPVVP(vswitch_class, traffic) elif deployment_scenario.find("op2p") >= 0: return VswitchControllerOP2P(vswitch_class, traffic, tunnel_operation) + elif deployment_scenario.find("clean") >= 0: + return VswitchControllerClean(vswitch_class, traffic) def create_vnf(deployment_scenario, vnf_class): diff --git a/core/traffic_controller_rfc2544.py b/core/traffic_controller_rfc2544.py index 020b4aec..2630101f 100644 --- a/core/traffic_controller_rfc2544.py +++ b/core/traffic_controller_rfc2544.py @@ -154,3 +154,16 @@ class TrafficControllerRFC2544(ITrafficController, IResults): """IResult interface implementation. """ return self._results + + def validate_send_traffic(self, result, traffic): + """Verify that send traffic has succeeded + """ + if len(self._results): + if 'b2b_frames' in self._results[-1]: + return float(self._results[-1]['b2b_frames']) > 0 + elif 'throughput_rx_fps' in self._results[-1]: + return float(self._results[-1]['throughput_rx_fps']) > 0 + else: + return True + else: + return False diff --git a/core/vswitch_controller_clean.py b/core/vswitch_controller_clean.py new file mode 100644 index 00000000..61724b9b --- /dev/null +++ b/core/vswitch_controller_clean.py @@ -0,0 +1,79 @@ +# Copyright 2015-2016 Intel Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""VSwitch controller for basic initialization of vswitch +""" + +import logging + +from core.vswitch_controller import IVswitchController + +class VswitchControllerClean(IVswitchController): + """VSwitch controller for Clean deployment scenario. + + Attributes: + _vswitch_class: The vSwitch class to be used. + _vswitch: The vSwitch object controlled by this controller + _deployment_scenario: A string describing the scenario to set-up in the + constructor. + """ + def __init__(self, vswitch_class, traffic): + """Initializes up the prerequisites for the Clean deployment scenario. + + :vswitch_class: the vSwitch class to be used. + """ + self._logger = logging.getLogger(__name__) + self._vswitch_class = vswitch_class + self._vswitch = vswitch_class() + self._deployment_scenario = "Clean" + self._logger.debug('Creation using ' + str(self._vswitch_class)) + self._traffic = traffic.copy() + + def setup(self): + """Sets up the switch for Clean. + """ + self._logger.debug('Setup using ' + str(self._vswitch_class)) + + try: + self._vswitch.start() + except: + self._vswitch.stop() + raise + + def stop(self): + """Tears down the switch created in setup(). + """ + self._logger.debug('Stop using ' + str(self._vswitch_class)) + self._vswitch.stop() + + def __enter__(self): + self.setup() + + def __exit__(self, type_, value, traceback): + self.stop() + + def get_vswitch(self): + """See IVswitchController for description + """ + return self._vswitch + + def get_ports_info(self): + """See IVswitchController for description + """ + pass + + def dump_vswitch_flows(self): + """See IVswitchController for description + """ + pass diff --git a/core/vswitch_controller_p2p.py b/core/vswitch_controller_p2p.py index 91c4e8a0..e9ab5cc4 100644 --- a/core/vswitch_controller_p2p.py +++ b/core/vswitch_controller_p2p.py @@ -81,12 +81,12 @@ class VswitchControllerP2P(IVswitchController): flow = flow_template.copy() flow.update({'table':'1', 'priority':'1', 'in_port':'1', - 'actions': ['write_actions(output:2)', 'write_metadata:2', + 'actions': ['write_actions(output:2)', 'write_metadata:0x2', 'goto_table:2']}) self.process_flow_template(bridge, flow) flow = flow_template.copy() flow.update({'table':'1', 'priority':'1', 'in_port':'2', - 'actions': ['write_actions(output:1)', 'write_metadata:1', + 'actions': ['write_actions(output:1)', 'write_metadata:0x1', 'goto_table:2']}) self.process_flow_template(bridge, flow) -- cgit 1.2.3-korg