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 --- src/ovs/ofctl.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/ovs/ofctl.py') diff --git a/src/ovs/ofctl.py b/src/ovs/ofctl.py index 1c5e6513..7cbdfe2c 100644 --- a/src/ovs/ofctl.py +++ b/src/ovs/ofctl.py @@ -34,6 +34,8 @@ _OVS_OFCTL_BIN = os.path.join(settings.getValue('OVS_DIR'), 'utilities', _OVS_VAR_DIR = '/usr/local/var/run/openvswitch/' +_OVS_BRIDGE_NAME = settings.getValue('VSWITCH_BRIDGE_NAME') + class OFBase(object): """Add/remove/show datapaths using ``ovs-ofctl``. """ @@ -63,7 +65,7 @@ class OFBase(object): # datapath management - def add_br(self, br_name='br0'): + def add_br(self, br_name=_OVS_BRIDGE_NAME): """Add datapath. :param br_name: Name of bridge @@ -75,7 +77,7 @@ class OFBase(object): return OFBridge(br_name, self.timeout) - def del_br(self, br_name='br0'): + def del_br(self, br_name=_OVS_BRIDGE_NAME): """Delete datapath. :param br_name: Name of bridge @@ -89,7 +91,7 @@ class OFBase(object): class OFBridge(OFBase): """Control a bridge instance using ``ovs-vsctl`` and ``ovs-ofctl``. """ - def __init__(self, br_name='br0', timeout=10): + def __init__(self, br_name=_OVS_BRIDGE_NAME, timeout=10): """Initialise bridge. :param br_name: Bridge name @@ -126,7 +128,8 @@ class OFBridge(OFBase): :return: None """ - cmd = ['sudo', _OVS_OFCTL_BIN, '-O', 'OpenFlow13', '--timeout', str(self.timeout)] + args + cmd = ['sudo', _OVS_OFCTL_BIN, '-O', 'OpenFlow13', '--timeout', + str(self.timeout)] + args return tasks.run_task( cmd, self.logger, 'Running ovs-ofctl...', check_error) -- cgit 1.2.3-korg