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 --- vsperf | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'vsperf') diff --git a/vsperf b/vsperf index 34f42ca5..67141a7e 100755 --- a/vsperf +++ b/vsperf @@ -35,6 +35,8 @@ from testcases import TestCase from tools import tasks from tools.collectors import collector from tools.pkt_gen import trafficgen +from vswitches import vswitch +from vnfs import vnf VERBOSITY_LEVELS = { 'debug': logging.DEBUG, @@ -117,6 +119,8 @@ def parse_arguments(): help='list all system metrics loggers and exit') parser.add_argument('--list-vswitches', action='store_true', help='list all system vswitches and exit') + parser.add_argument('--list-vnfs', action='store_true', + help='list all system vnfs and exit') parser.add_argument('--list-settings', action='store_true', help='list effective settings configuration and exit') parser.add_argument('test', nargs='*', help='test specification(s)') @@ -131,6 +135,7 @@ def parse_arguments(): help='debug level') group.add_argument('--trafficgen', help='traffic generator to use') group.add_argument('--vswitch', help='vswitch implementation to use') + group.add_argument('--vnf', help='vnf to use') group.add_argument('--sysmetrics', help='system metrics logger to use') group = parser.add_argument_group('test behavior options') group.add_argument('--xunit', action='store_true', @@ -311,7 +316,13 @@ def main(): settings.getValue('VSWITCH_DIR')) sys.exit(1) - + if args['vnf']: + vnfs = Loader().get_vnfs() + if args['vnf'] not in vnfs: + logging.error('there are no vnfs matching \'%s\' found in' + ' \'%s\'. exiting...', args['vnf'], + settings.getValue('vnf_dir')) + sys.exit(1) # generate results directory name date = datetime.datetime.fromtimestamp(time.time()) @@ -353,6 +364,10 @@ def main(): print(Loader().get_vswitches_printable()) exit() + if args['list_vnfs']: + print(Loader().get_vnfs_printable()) + exit() + if args['list_settings']: print(str(settings)) exit() -- cgit 1.2.3-korg