From 3af55a78fcd572f93b1a46178bffc4c8e90534f2 Mon Sep 17 00:00:00 2001 From: Dino Simeon Madarang Date: Wed, 15 Jul 2015 09:22:07 +0100 Subject: vnfs: Enable PVP using vhost-user Enable booting of a VM with DPDK and run testpmd for PVP testing. * Added throughput and back2back tests with pvp deployment scenario in 01_testcases.conf * PVP requires DPDK 2.0 with VHOST_USER enabled and QEMU 2.2.0 * Tested on CentOS7 and Fedora 20 * Fix conflict with change 1078 Recent Changes: * Fix merge conflict (testcase.py and testcases.conf) * Remove QEMU_DIR. User must set QEMU_BIN * Set bidir traffic to True * Add flow for bi-directional traffic * Use working OVS_TAG ad2e649834be20dd01b1632799fe778106a96a2d * Merge change 1096 (src: Add QEMU makefile) * Set virtio-net-pci csum=off and other variables to off * Move hardcoded values to conf/* JIRA: VSPERF-56 Change-Id: I4ad184531064855493483d9833a7722c9f7d3576 Signed-off-by: Madarang, Dino Simeon Signed-off-by: Meghan Halton Reviewed-by: Billy O Mahony Reviewed-by: Maryam Tahhan Reviewed-by: Martin Klozik --- conf/01_testcases.conf | 17 ++++++++++++++++- conf/04_vnf.conf | 32 +++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 8 deletions(-) (limited to 'conf') diff --git a/conf/01_testcases.conf b/conf/01_testcases.conf index cfe0b466..82252fb2 100755 --- a/conf/01_testcases.conf +++ b/conf/01_testcases.conf @@ -74,5 +74,20 @@ PERFORMANCE_TESTS = [ # allowed range: 0-65535; value 0 disables MultiStream feature "MultiStream": "8000", }, - + { + "Name": "pvp_tput", + "Traffic Type": "rfc2544", + "Collector": "cpu", + "Deployment": "pvp", + "Description": "LTD.Throughput.RFC2544.PacketLossRatio", + "biDirectional": "True", + }, + { + "Name": "pvp_back2back", + "Traffic Type": "back2back", + "Collector": "cpu", + "Deployment": "pvp", + "Description": "LTD.Throughput.RFC2544.BackToBackFrames", + "biDirectional": "True", + }, ] diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf index 2603d589..7d1399d1 100644 --- a/conf/04_vnf.conf +++ b/conf/04_vnf.conf @@ -15,13 +15,8 @@ # ############################ # VNF configuration # ############################ -QEMU_DIR = '' - -# ############################ -# Executables -# ############################ - -QEMU_BIN = 'qemu-system-x86_64' +VNF_DIR = 'vnfs/' +VNF = 'QemuDpdkVhost' # ############################ # Guest configuration @@ -56,3 +51,26 @@ LOG_FILE_QEMU = 'qemu.log' # multiple guests will result in log files with the guest number appended LOG_FILE_GUEST_CMDS = 'guest-cmds.log' +# ############################ +# Executables +# ############################ + +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' + +GUEST_NET1_PCI_ADDRESS = '00:04.0' +GUEST_NET2_PCI_ADDRESS = '00:05.0' + -- cgit