Merge "VMware: fix booting from volume"

nova/tests/virt/vmwareapi/test_vmops.py

@@ -17,6 +17,7 @@ import mock
 import contextlib
 import mock
 
+from nova import exception
 from nova.network import model as network_model
 from nova import test
 from nova.tests.virt.vmwareapi import stubs
@@ -86,6 +87,21 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
                 ])
         utils.reset_is_neutron()
 
+    def test_get_disk_format_none(self):
+        format, is_iso = self._vmops._get_disk_format({'disk_format': None})
+        self.assertIsNone(format)
+        self.assertFalse(is_iso)
+
+    def test_get_disk_format_iso(self):
+        format, is_iso = self._vmops._get_disk_format({'disk_format': 'iso'})
+        self.assertEqual('iso', format)
+        self.assertTrue(is_iso)
+
+    def test_get_disk_format_bad(self):
+        self.assertRaises(exception.InvalidDiskFormat,
+                          self._vmops._get_disk_format,
+                          {'disk_format': 'foo'})
+
     def test_get_machine_id_str(self):
         result = vmops.VMwareVMOps._get_machine_id_str(self.network_info)
         self.assertEqual(result,

nova/virt/vmwareapi/vmops.py

@@ -165,7 +165,7 @@ class VMwareVMOps(object):
 
     def _get_disk_format(self, image_meta):
         disk_format = image_meta.get('disk_format')
-        if disk_format not in ['iso', 'vmdk']:
+        if disk_format not in ['iso', 'vmdk', None]:
             raise exception.InvalidDiskFormat(disk_format=disk_format)
         return (disk_format, disk_format == 'iso')