From 9b590e2282714e3b5aae26c3ac2d8c857b1ddb82 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Fri, 2 Oct 2015 02:18:09 +0100 Subject: Enable PVP and PVVP deployments for Vanilla OVS Support for PVP and PVVP scenerios using Vanilla OVS was added. VMs are configured to forward traffic between virtual interfaces by standard linux capabilities. Traffic generator script was updated to accept MAC and IP address configuration to allow VM forwarding configuration. VSPERF-66, VSPERF-70 Change-Id: Ia70ab6be547b39928a1eae319faba779d4e29284 Signed-off-by: Martin Klozik Signed-off-by: Dino Simeon Madarang Reviewed-by: Maryam Tahhan Reviewed-by: Brian Castelli Reviewed-by: Gene Snider Reviewed-by: Al Morton Reviewed-by: Tv Rao --- vnfs/qemu/qemu.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'vnfs/qemu/qemu.py') diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py index 338ca771..2e2c63df 100644 --- a/vnfs/qemu/qemu.py +++ b/vnfs/qemu/qemu.py @@ -41,13 +41,7 @@ class IVnfQemu(IVnf): def __init__(self): """ - :param timeout: Time to wait for login prompt. If set to - 0 do not wait. - :param number: Number of QEMU instance, used when multiple QEMU - instances are started at once. - :param args: Arguments to pass to QEMU. - - :returns: None + Initialisation function. """ super(IVnfQemu, self).__init__() self._logger = logging.getLogger(__name__) @@ -67,9 +61,6 @@ class IVnfQemu(IVnf): '-cpu', 'host', '-drive', 'if=scsi,file=' + S.getValue('GUEST_IMAGE')[self._number], - '-drive', - 'if=scsi,file=fat:rw:%s,snapshot=off' % - S.getValue('GUEST_SHARE_DIR')[self._number], '-boot', 'c', '--enable-kvm', '-monitor', 'unix:%s,server,nowait' % self._monitor, '-object', @@ -104,7 +95,8 @@ class IVnfQemu(IVnf): Start QEMU instance, login and prepare for commands. """ super(IVnfQemu, self).start() - self._affinitize() + if S.getValue('VNF_AFFINITIZATION_ON'): + self._affinitize() if self._timeout: self._login() -- cgit 1.2.3-korg