diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2015-10-02 02:18:09 +0100 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2015-10-12 14:58:14 +0000 |
| commit | 9b590e2282714e3b5aae26c3ac2d8c857b1ddb82 (patch) | |
| tree | 3739c9f042949c02e3254be342f0076d6ed2f9f2 /vnfs/qemu/qemu.py | |
| parent | f8b7dd0a2611061fed7134474ae10ab85e80cf3d (diff) | |
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 <martinx.klozik@intel.com>
Signed-off-by: Dino Simeon Madarang <dino.simeonx.madarang@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Reviewed-by: Gene Snider <eugene.snider@huawei.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Tv Rao <tv.rao@freescale.com>
Diffstat (limited to 'vnfs/qemu/qemu.py')
| -rw-r--r-- | vnfs/qemu/qemu.py | 14 |
1 files changed, 3 insertions, 11 deletions
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() |