fix(imsv2): fixed conflict between creation and update (#605)

fix(imsv2): fixed conflict between creation and update

Reviewed-by: Anton Sidelnikov

Author: RusselSand

otcextensions/sdk/imsv2/v2/image.py

@@ -63,9 +63,9 @@ class Image(resource.Resource):
                                               'enterprise_project_id')
 
     name = resource.Body('name')
-    description = resource.Body('__description')
+    description = resource.Body('description')
     os_type = resource.Body('os_type')
-    os_version = resource.Body('__os_version')
+    os_version = resource.Body('os_version')
     image_url = resource.Body('image_url')
     instance_id = resource.Body('instance_id')
     min_disk = resource.Body('min_disk', type=int)
@@ -91,16 +91,16 @@ class Image(resource.Resource):
     protected = resource.Body('protected', type=bool)
     virtual_size = resource.Body('virtual_size')
     hw_firmware_type = resource.Body('hw_firmware_type')
-    disk_format = resource.Body('disk_format')
-    container_format = resource.Body('container_format')
     hw_vif_multiqueue_enabled = resource.Body('hw_vif_multiqueue_enabled')
     checksum = resource.Body('checksum')
     size = resource.Body('size')
     file = resource.Body('file')
+    __description = resource.Body('__description')
+    __os_type = resource.Body('__os_type')
+    __os_version = resource.Body('__os_version')
     os_bit = resource.Body('__os_bit')
     platform = resource.Body('__platform')
     is_registered = resource.Body('__is_registered')
-    os_type = resource.Body('__os_type')
     image_source_type = resource.Body('__image_source_type')
     imagetype = resource.Body('__imagetype')
     originalimagename = resource.Body('__originalimagename')

otcextensions/tests/functional/sdk/imsv2/v2/test_image.py

@@ -30,6 +30,7 @@ def test_create_image(self):
             "image_url":
                 "ims-test-images:rancheros-openstack.img",
             "os_version": "CentOS 7.0 64bit",
+            "os_type": "Linux",
             "min_disk": 40,
             "image_tags": [{"key": "key2", "value": "value2"},
                            {"key": "key1", "value": "value1"}]