summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/04_vnf.conf5
-rw-r--r--vnfs/qemu/qemu.py8
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()