openstack/shade
Code Issues Proposed changes

Fix image task uploads

Browse Source 
These are accidentally working in production in a very inefficient
manner for nodepool.

Change-Id: I6cf4502d96ac0ac98a8723ed436b0859dfc60325
This commit is contained in:
Monty Taylor 2017-10-12 11:52:06 -05:00
parent 1fcc3e7aee
commit e7ade19fbb
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shade/openstackcloud.py
View File

@ -4704,9 +4704,8 @@ class OpenStackCloud(
"Timeout waiting for the image to import."):
try:
if image_id is None:
data = self._image_client.get(
status = self._image_client.get(
'/tasks/{id}'.format(id=glance_task.id))
status = self._get_and_munchify('images', data=data)
except OpenStackCloudHTTPError as e:
if e.response.status_code == 503:
# Clear the exception so that it doesn't linger
@ -4716,8 +4715,8 @@ class OpenStackCloud(
continue
raise
if status.status == 'success':
image_id = status.result['image_id']
if status['status'] == 'success':
image_id = status['result']['image_id']
try:
image = self.get_image(image_id)
except OpenStackCloudHTTPError as e:
@ -4736,15 +4735,15 @@ class OpenStackCloud(
"Image Task %s imported %s in %s",
glance_task.id, image_id, (time.time() - start))
return self.get_image(image_id)
if status.status == 'failure':
if status.message == IMAGE_ERROR_396:
elif status['status'] == 'failure':
if status['message'] == IMAGE_ERROR_396:
glance_task = self._image_client.post(
'/tasks', data=task_args)
self.list_images.invalidate(self)
else:
raise OpenStackCloudException(
"Image creation failed: {message}".format(
message=status.message),
message=status['message']),
extra_data=status)
else:
return glance_task

2
shade/tests/unit/test_image.py
View File

@ -339,7 +339,7 @@ class TestImage(BaseTestImage):
dict(method='GET',
uri='https://image.example.com/v2/tasks/{id}'.format(
id=task_id),
json={'images': args}),
json=args),
dict(method='GET', uri='https://image.example.com/v2/images',
json={'images': [image_no_checksums]}),
dict(method='PATCH',