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 --- conf/04_vnf.conf | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) (limited to 'conf/04_vnf.conf') diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf index 1c3712ed..034e4108 100644 --- a/conf/04_vnf.conf +++ b/conf/04_vnf.conf @@ -16,18 +16,20 @@ # VNF configuration # ############################ VNF_DIR = 'vnfs/' -VNF = 'QemuDpdkVhost' +VNF = 'QemuDpdkVhostUser' # ############################ # Guest configuration # ############################ # directory which is shared to QEMU guests. Useful for exchanging files -# between host and guest -GUEST_SHARE_DIR = '/tmp/qemu_share' +# between host and guest, VNF specific share will be created +# For 2 VNFs you may use ['/tmp/qemu0_share', '/tmp/qemu1_share'] +GUEST_SHARE_DIR = ['/tmp/qemu0_share', '/tmp/qemu1_share'] # location of guest disk image -GUEST_IMAGE = '' +# For 2 VNFs you may use ['guest1.img', 'guest2.img'] +GUEST_IMAGE = ['', ''] # username for guest image GUEST_USERNAME = '' @@ -57,34 +59,25 @@ LOG_FILE_GUEST_CMDS = 'guest-cmds.log' QEMU_BIN = 'qemu-system-x86_64' -# Guest shell prompt when inside DPDK dir -# for example: root@ovdk_guest DPDK]#' -QEMU_GUEST_DPDK_PROMPT = '' - -# Guest shell prompt when inside the -# test-pmd directory of DPDK -# for example: 'root@ovdk_guest test-pmd]#' -QEMU_GUEST_TEST_PMD_PROMPT = '' - OVS_VAR_DIR = '/usr/local/var/run/openvswitch/' -GUEST_NET1_MAC = '00:00:00:00:00:01' -GUEST_NET2_MAC = '00:00:00:00:00:02' +# For 2 VNFs you may use ['00:00:00:00:00:01', '00:00:00:00:00:03'] +GUEST_NET1_MAC = ['00:00:00:00:00:01', '00:00:00:00:00:03'] +GUEST_NET2_MAC = ['00:00:00:00:00:02', '00:00:00:00:00:04'] -GUEST_NET1_PCI_ADDRESS = '00:04.0' -GUEST_NET2_PCI_ADDRESS = '00:05.0' -GUEST_MEMORY = '3072' +# For 2 VNFs you may use ['00:04.0', '00:04.0'] +GUEST_NET1_PCI_ADDRESS = ['00:04.0', '00:04.0'] +GUEST_NET2_PCI_ADDRESS = ['00:05.0', '00:05.0'] + +GUEST_MEMORY = ['4096', '4096'] # test-pmd requires 2 VM cores -GUEST_SMP = '2' +GUEST_SMP = ['2', '2'] # Host cores to use to affinitize the SMP cores of a QEMU instance # For 2 VNFs you may use [(4,5), (6, 7)] -GUEST_CORE_BINDING = [(4, 5)] - -# Starte Qemu on cores 3, 4,5 (0x038) -QEMU_CORE = '38' +GUEST_CORE_BINDING = [(6, 7), (9, 10)] GUEST_OVS_DPDK_DIR = '/root/ovs_dpdk' OVS_DPDK_SHARE = '/mnt/ovs_dpdk_share' -- cgit 1.2.3-korg