From 89e23da8e473387b2e6cb37a2b882d2d3c68655c Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Fri, 25 Sep 2015 18:00:17 +0100 Subject: Enable PVVP deployment for DPDK Vhost User and Vhost Cuse Generic PVVP deployment support has been added. Two new testcase scenarios for throughput and back2back tests with PVVP deployment were added. Original implementation of PVP has been refactored Following files were affected: modified: conf/01_testcases.conf modified: conf/02_vswitch.conf modified: conf/04_vnf.conf modified: core/__init__.py modified: core/component_factory.py modified: core/loader/loader_servant.py modified: core/vnf_controller.py deleted: core/vnf_controller_p2p.py deleted: core/vnf_controller_pvp.py modified: core/vswitch_controller_p2p.py modified: core/vswitch_controller_pvp.py new file: core/vswitch_controller_pvvp.py modified: docs/to-be-reorganized/NEWS.rst modified: docs/to-be-reorganized/quickstart.rst modified: src/dpdk/dpdk.py modified: src/ovs/ofctl.py modified: testcases/testcase.py modified: tools/tasks.py new file: vnfs/qemu/qemu.py new file: vnfs/qemu/qemu_dpdk.py modified: vnfs/qemu/qemu_dpdk_vhost_cuse.py modified: vnfs/qemu/qemu_dpdk_vhost_user.py modified: vnfs/vnf/vnf.py modified: vswitches/ovs_dpdk_vhost.py Change-Id: Ib6869a29337a184cb58c57fd96bba1183aba00ab JIRA: VSPERF-68, VSPERF-69 Signed-off-by: Martin Klozik (martinx.klozik@intel.com) Reviewed-by: Maryam Tahhan Reviewed-by: Brian Castelli --- core/vnf_controller_pvp.py | 69 ---------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 core/vnf_controller_pvp.py (limited to 'core/vnf_controller_pvp.py') diff --git a/core/vnf_controller_pvp.py b/core/vnf_controller_pvp.py deleted file mode 100644 index 1878db10..00000000 --- a/core/vnf_controller_pvp.py +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2015 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. -"""VNF Controller for the PVP scenario -""" - -import logging - -from core.vnf_controller import IVnfController - -class VnfControllerPVP(IVnfController): - """VNF controller for the PVP scenario. - - Used to set-up and control a VNF provider for the PVP scenario. - - Attributes: - _vnf_class: A class object representing the VNF to be used. - _deployment_scenario: A string describing the scenario to set-up in the - constructor. - _vnfs: A list of vnfs controlled by the controller. - """ - - #TODO: Decide on contextmanager or __enter/exit__ strategy - def __init__(self, vnf_class): - """Sets up the VNF infrastructure for the PVP deployment scenario. - - :param vnf_class: The VNF class to be used. - """ - self._logger = logging.getLogger(__name__) - self._vnf_class = vnf_class() - self._deployment_scenario = "PVP" - self._vnfs = [vnf_class(deployment=self._deployment_scenario)] - self._logger.debug('__init__ with ' + str(self._vnfs[0])) - #TODO call vnf.xxx to carry out the required setup - - def get_vnfs(self): - """See IVnfController for description - """ - self._logger.debug('get_vnfs with ' + str(self._vnfs[0])) - return self._vnfs - - def start(self): - """See IVnfController for description - """ - self._logger.debug('start with ' + str(self._vnfs[0])) - for vnf in self._vnfs: - vnf.start() - - def stop(self): - """See IVnfController for description - """ - self._logger.debug('stop with ' + str(self._vnfs[0])) - self._vnfs[0].stop() - - def __enter__(self): - self.start() - - def __exit__(self, type_, value, traceback): - self.stop() -- cgit 1.2.3-korg