From 5f98dededf101ce7ee3c11bd41d84ae61cce7feb Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Wed, 2 Dec 2015 10:04:19 +0000 Subject: vnfs: configurable loopback application support inside VM For PVP and PVVP deployments, traffic inside virtual machines must be forwarded between its interfaces. There are several forwarding options supported by VSPERF, including DPDK testpmd, Huawei l2fwd kernel module and linux bridge. Another option is, that VM image has built in forwarding functionality and vsperf doesn't configure it itself. User can select VM loopback application by configuration option GUEST_LOOPBACK (per VM) or by SCALAR cli option guest_loopback (global settings). Selected guest loopback application(s) will be written into test results CSV file and test report MD file. Default wildcarded guest login prompt was added. Guest startup guarding timer can be configured. Path to OVS kernel module has been fixed. Change-Id: If738da1ea09112f9cf2267afcbc99a6797f3a03a JIRA: VSPERF-130 Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan --- src/dpdk/dpdk.py | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/dpdk') diff --git a/src/dpdk/dpdk.py b/src/dpdk/dpdk.py index e1a8e657..85d0001e 100644 --- a/src/dpdk/dpdk.py +++ b/src/dpdk/dpdk.py @@ -52,7 +52,6 @@ def init(): _insert_modules() _remove_vhost_net() _bind_nics() - _copy_dpdk_for_guest() def cleanup(): @@ -334,25 +333,6 @@ def _unbind_nics(): nic_drivers) -def _copy_dpdk_for_guest(): - """Copy dpdk code to GUEST_SHARE_DIR[s] for use by guests. - """ - for guest_dir in settings.getValue('GUEST_SHARE_DIR'): - guest_share_dir = os.path.join(guest_dir, 'DPDK') - - if not os.path.exists(guest_share_dir): - os.makedirs(guest_share_dir) - - try: - tasks.run_task(['rsync', '-a', '-r', '-l', r'--exclude="\.git"', - os.path.join(settings.getValue('RTE_SDK'), ''), - guest_share_dir], - _LOGGER, - 'Copying DPDK to shared directory...', - True) - except subprocess.CalledProcessError: - _LOGGER.error('Unable to copy DPDK to shared directory') - # # Vhost-user cleanup -- cgit 1.2.3-korg