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 --- testcases/testcase.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'testcases/testcase.py') diff --git a/testcases/testcase.py b/testcases/testcase.py index f5b35782..77d5992d 100644 --- a/testcases/testcase.py +++ b/testcases/testcase.py @@ -14,7 +14,6 @@ """TestCase base class """ -import time import csv import os import logging @@ -66,7 +65,8 @@ class TestCase(object): loader.get_vnf_class()) vswitch_ctl = component_factory.create_vswitch( self._deployment, - loader.get_vswitch_class()) + loader.get_vswitch_class(), + self._bidir) collector_ctl = component_factory.create_collector( self._collector, loader.get_collector_class()) @@ -75,21 +75,22 @@ class TestCase(object): self._logger.debug("Setup:") collector_ctl.log_cpu_stats() with vswitch_ctl: - if vnf_ctl: - vnf_ctl.start() + with vnf_ctl: traffic = {'traffic_type': self._traffic_type, 'bidir': self._bidir, 'multistream': self._multistream} + vswitch = vswitch_ctl.get_vswitch() if self._frame_mod == "vlan": - flow = {'table':'2', 'priority':'1000', 'metadata':'2', 'actions': ['push_vlan:0x8100','goto_table:3']} + flow = {'table':'2', 'priority':'1000', 'metadata':'2', + 'actions': ['push_vlan:0x8100', 'goto_table:3']} vswitch.add_flow('br0', flow) - flow = {'table':'2', 'priority':'1000', 'metadata':'1', 'actions': ['push_vlan:0x8100','goto_table:3']} + flow = {'table':'2', 'priority':'1000', 'metadata':'1', + 'actions': ['push_vlan:0x8100', 'goto_table:3']} vswitch.add_flow('br0', flow) - with traffic_ctl: - traffic_ctl.send_traffic(traffic) - + with traffic_ctl: + traffic_ctl.send_traffic(traffic) self._logger.debug("Traffic Results:") traffic_ctl.print_results() -- cgit 1.2.3-korg