Merge "Support img_type Glance property"

2 files changed, 18 insertions, 0 deletions

diff --git a/ironic/common/images.py b/ironic/common/images.py
index 30eaed9e3..9f771ca29 100644
--- a/ironic/common/images.py
+++ b/ironic/common/images.py
@@ -607,6 +607,10 @@ def is_whole_disk_image(ctx, instance_info):
         except Exception:
             return
 
+        image_type = iproperties.get('img_type')
+        if image_type:
+            return image_type != IMAGE_TYPE_PARTITION
+
         is_whole_disk_image = (not iproperties.get('kernel_id')
                                and not iproperties.get('ramdisk_id'))
     else:
diff --git a/ironic/tests/unit/common/test_images.py b/ironic/tests/unit/common/test_images.py
index f3fbbbf77..fe6b67ad3 100644
--- a/ironic/tests/unit/common/test_images.py
+++ b/ironic/tests/unit/common/test_images.py
@@ -244,6 +244,20 @@ class IronicImagesTestCase(base.TestCase):
 
     @mock.patch.object(images, 'get_image_properties', autospec=True)
     @mock.patch.object(glance_utils, 'is_glance_image', autospec=True)
+    def test_is_whole_disk_image_partition_image_with_type(self, mock_igi,
+                                                           mock_gip):
+        mock_igi.return_value = True
+        mock_gip.return_value = {'img_type': images.IMAGE_TYPE_PARTITION}
+        instance_info = {'image_source': 'glance://partition_image'}
+        image_source = instance_info['image_source']
+        is_whole_disk_image = images.is_whole_disk_image('context',
+                                                         instance_info)
+        self.assertFalse(is_whole_disk_image)
+        mock_igi.assert_called_once_with(image_source)
+        mock_gip.assert_called_once_with('context', image_source)
+
+    @mock.patch.object(images, 'get_image_properties', autospec=True)
+    @mock.patch.object(glance_utils, 'is_glance_image', autospec=True)
     def test_is_whole_disk_image_whole_disk_image(self, mock_igi, mock_gip):
         mock_igi.return_value = True
         mock_gip.return_value = {}