Merge lp:~rconradharris/glance/bug720459 into lp:~glance-coresec/glance/cactus-trunk

[Rick Harris]

Removes image type validation in the Glance registry.

Nova xs-unified-images requires adding a new image type 'vhd' along side of 'machine', 'raw', etc. Since image_type isn't used by Glance itself (it merely stores the value and hands it back to Nova), Glance shouldn't be the arbiter of what values are acceptable-- Nova should. This promotes loose-coupling and ensures that Glance won't have to change in lock-step with Nova.

More to the point, this a stop-gap to make Glance work with the new xs-unified-images branch until we get proper `container_format` and `disk_format` modeling in Glance. When that happens, we may end up ditching `image_type` altogether.

[Jay Pipes (jaypipes)]

this will break a variety of tests in bug704854. Is it possible to remove this image_type when we do the disk_format changes? Is there a reason this patch has to hit before that blueprint is completed?

[lp:~rconradharris/glance/bug720459]

75. By Rick Harris on 2011-02-17

Reverting the removal of validation

76. By Rick Harris on 2011-02-17

Adding vhd as recognized image type

[Rick Harris (rconradharris)]

Per conversation with Jay, I've updated the patch to add 'vhd' as one of the recognized image types (rather than remove validation entirely).

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Jay Pipes (jaypipes)]

ty, rick :)

review: Approve

=== modified file 'glance/registry/db/models.py'
--- glance/registry/db/models.py	2011-02-02 06:13:39 +0000
+++ glance/registry/db/models.py	2011-02-17 18:38:43 +0000
@@ -103,7 +103,7 @@
 
     @validates('type')
     def validate_type(self, key, type):
-        if not type in ('machine', 'kernel', 'ramdisk', 'raw'):
+        if not type in ('machine', 'kernel', 'ramdisk', 'raw', 'vhd'):
             raise exception.Invalid(
                 "Invalid image type '%s' for image." % type)
         return type