diff options
| author |   Christian Trautman <ctrautma@redhat.com> | 2016-08-23 06:31:39 -0400 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2016-08-24 08:42:58 +0000 |
| commit | bd8712a917d9a0c7272506fd85816f857c32529e (patch) | |
| tree | 12fed83223c356242152f00feb2d97e70224aa29 | |
| parent | 1ea5c5239f9003f9cb8492f1d5b00a75724a7180 (diff) | |
guest_drive_type: Adds guest drive configuration options
Adds boot and mounted drive configuration options.
JIRA: VSPERF-379
Change-Id: Ic0673a9b9f7a3430d7ac4db5fb9bf4228872f501
signed-off-by: Christian Trautman <ctrautma@redhat.com>
| -rw-r--r-- | conf/04_vnf.conf | 5 | ||||
| -rw-r--r-- | vnfs/qemu/qemu.py | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf index ec242662..8069ef0d 100644 --- a/conf/04_vnf.conf +++ b/conf/04_vnf.conf @@ -37,6 +37,11 @@ GUEST_IMAGE = ['', '', '', '', '', ''] # For 2 VNFs you may use [180, 180] GUEST_TIMEOUT = [180, 180, 180, 180, 180, 180] +# Guest images may require different drive types such as ide to mount shared +# locations and/or boot correctly. You can modify the types here. +GUEST_BOOT_DRIVE_TYPE = 'scsi' +GUEST_SHARED_DRIVE_TYPE = 'scsi' + # packet forwarding mode supported by testpmd; Please see DPDK documentation # for comprehensive list of modes supported by your version. # e.g. io|mac|mac_retry|macswap|flowgen|rxonly|txonly|csum|icmpecho|... diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py index b5eaddc3..e91eaa29 100644 --- a/vnfs/qemu/qemu.py +++ b/vnfs/qemu/qemu.py @@ -85,7 +85,8 @@ class IVnfQemu(IVnf): '-m', S.getValue('GUEST_MEMORY')[self._number], '-smp', str(S.getValue('GUEST_SMP')[self._number]), '-cpu', 'host,migratable=off', - '-drive', 'if=scsi,file=' + + '-drive', 'if={},file='.format(S.getValue( + 'GUEST_BOOT_DRIVE_TYPE')) + S.getValue('GUEST_IMAGE')[self._number], '-boot', 'c', '--enable-kvm', '-monitor', 'unix:%s,server,nowait' % self._monitor, @@ -97,8 +98,9 @@ class IVnfQemu(IVnf): '-nographic', '-vnc', str(vnc), '-name', name, '-snapshot', '-net none', '-no-reboot', '-drive', - 'if=scsi,format=raw,file=fat:rw:%s,snapshot=off' % - S.getValue('GUEST_SHARE_DIR')[self._number], + 'if=%s,format=raw,file=fat:rw:%s,snapshot=off' % + (S.getValue('GUEST_SHARED_DRIVE_TYPE'), + S.getValue('GUEST_SHARE_DIR')[self._number]), ] self._configure_logging() |