openstack/heat
Code Issues Proposed changes

Merge "Use default client name for glance image resource"

Browse Source
This commit is contained in:
Jenkins
2015-08-03 12:51:06 +00:00
committed by Gerrit Code Review
parent 39bc20509d 9b25d7419f
commit 1f801b43fd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
heat/engine/resources/openstack/glance/glance_image.py
+3 -3
View File
@@ -104,12 +104,12 @@ class GlanceImage(resource.Resource):
def handle_create(self):
args = dict((k, v) for k, v in self.properties.items()
if v is not None)
image_id = self.glance().images.create(**args).id
image_id = self.client().images.create(**args).id
self.resource_id_set(image_id)
return image_id
def check_create_complete(self, image_id):
image = self.glance().images.get(image_id)
image = self.client().images.get(image_id)
return image.status == 'active'
def handle_delete(self):
@@ -117,7 +117,7 @@ class GlanceImage(resource.Resource):
return
try:
self.glance().images.delete(self.resource_id)
self.client().images.delete(self.resource_id)
except Exception as ex:
self.client_plugin().ignore_not_found(ex)
heat/tests/test_glance_image.py
+1 -1
View File
@@ -71,7 +71,7 @@ class GlanceImageTest(common.HeatTestCase):
self.my_image = self.stack['my_image']
glance = mock.MagicMock()
self.glanceclient = mock.MagicMock()
self.my_image.glance = glance
self.my_image.client = glance
glance.return_value = self.glanceclient
self.images = self.glanceclient.images