Default to Glance v2

While we still require Glance v1 for creating the glance image resource,
there is no reason to not default to v2 for everything else, which is
mostly the glance image constraint. Let's do that.

Change-Id: I5919ec4e884e66941dc8a7365db34f34422d5191
This commit is contained in:
Thomas Herve 2017-01-11 15:57:04 +01:00
parent 68526bc0bc
commit 6813a76e75
2 changed files with 14 additions and 16 deletions

View File

@ -32,7 +32,7 @@ class GlanceClientPlugin(client_plugin.ClientPlugin):
supported_versions = [V1, V2] = ['1', '2']
default_version = V1
default_version = V2
def _create(self, version=None):
con = self.context

View File

@ -180,22 +180,22 @@ class GlanceImage(resource.Resource):
os_distro = args.pop(self.OS_DISTRO, None)
ramdisk_id = args.pop(self.RAMDISK_ID, None)
image_id = self.client().images.create(**args).id
image_id = self.client(version=self.client_plugin().V1).images.create(
**args).id
self.resource_id_set(image_id)
v2_images = self.client(version=self.client_plugin().V2).images
images = self.client().images
if architecture is not None:
v2_images.update(image_id, architecture=architecture)
images.update(image_id, architecture=architecture)
if kernel_id is not None:
v2_images.update(image_id, kernel_id=kernel_id)
images.update(image_id, kernel_id=kernel_id)
if os_distro is not None:
v2_images.update(image_id, os_distro=os_distro)
images.update(image_id, os_distro=os_distro)
if ramdisk_id is not None:
v2_images.update(image_id, ramdisk_id=ramdisk_id)
images.update(image_id, ramdisk_id=ramdisk_id)
for tag in tags:
self.client(
version=self.client_plugin().V2).image_tags.update(
self.client().image_tags.update(
image_id,
tag)
@ -212,20 +212,18 @@ class GlanceImage(resource.Resource):
new_tags = set(diff_tags) - set(existing_tags)
for tag in new_tags:
self.client(
version=self.client_plugin().V2).image_tags.update(
self.client().image_tags.update(
self.resource_id,
tag)
removed_tags = set(existing_tags) - set(diff_tags)
for tag in removed_tags:
with self.client_plugin().ignore_not_found:
self.client(
version=self.client_plugin().V2).image_tags.delete(
self.client().image_tags.delete(
self.resource_id,
tag)
v2_images = self.client(version=self.client_plugin().V2).images
images = self.client().images
if self.EXTRA_PROPERTIES in prop_diff:
old_properties = self.properties.get(self.EXTRA_PROPERTIES) or {}
@ -236,9 +234,9 @@ class GlanceImage(resource.Resource):
# Though remove_props defaults to None within the glanceclient,
# setting it to a list (possibly []) every time ensures only one
# calling format to images.update
v2_images.update(self.resource_id, remove_props, **prop_diff)
images.update(self.resource_id, remove_props, **prop_diff)
else:
v2_images.update(self.resource_id, **prop_diff)
images.update(self.resource_id, **prop_diff)
def _show_resource(self):
if self.glance().version == 1.0: