diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2015-09-25 18:00:17 +0100 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2015-10-07 14:53:13 +0000 |
| commit | 89e23da8e473387b2e6cb37a2b882d2d3c68655c (patch) | |
| tree | 41bd86bc1447bf9bcbfa33cd95f175c258ede9d7 /core/vswitch_controller_pvp.py | |
| parent | 1550b638fca662c5e68556702ff0316c3fc9562c (diff) | |
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 <maryam.tahhan@intel.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Diffstat (limited to 'core/vswitch_controller_pvp.py')
| -rw-r--r-- | core/vswitch_controller_pvp.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/core/vswitch_controller_pvp.py b/core/vswitch_controller_pvp.py index 8c409dc2..80c0fdb2 100644 --- 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,4 @@ 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')) |