Skip to content

Commit

Permalink
Rename get_image_meta method into check_image for Glance V1 client
Browse files Browse the repository at this point in the history
All tempest clients (except the object-storage client) use a check_
prefix in names of their methods for HEAD requests.
This patch is intended to rename the get_image_meta method into the
check_image method for consistency.

Change-Id: I4ff165f22d68b6dbf55c20b774bc290020faa8cd
  • Loading branch information
ylobankov committed May 24, 2016
1 parent 2855a18 commit 9d28a0f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
6 changes: 3 additions & 3 deletions tempest/api/image/v1/test_images.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,20 +305,20 @@ def _create_standard_image(cls, name, container_format,
@test.idempotent_id('01752c1c-0275-4de3-9e5b-876e44541928')
def test_list_image_metadata(self):
# All metadata key/value pairs for an image should be returned
resp_metadata = self.client.get_image_meta(self.image_id)
resp_metadata = self.client.check_image(self.image_id)
expected = {'key1': 'value1'}
self.assertEqual(expected, resp_metadata['properties'])

@test.idempotent_id('d6d7649c-08ce-440d-9ea7-e3dda552f33c')
def test_update_image_metadata(self):
# The metadata for the image should match the updated values
req_metadata = {'key1': 'alt1', 'key2': 'value2'}
metadata = self.client.get_image_meta(self.image_id)
metadata = self.client.check_image(self.image_id)
self.assertEqual(metadata['properties'], {'key1': 'value1'})
metadata['properties'].update(req_metadata)
metadata = self.client.update_image(
self.image_id, properties=metadata['properties'])['image']

resp_metadata = self.client.get_image_meta(self.image_id)
resp_metadata = self.client.check_image(self.image_id)
expected = {'key1': 'alt1', 'key2': 'value2'}
self.assertEqual(expected, resp_metadata['properties'])
2 changes: 1 addition & 1 deletion tempest/scenario/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ def create_server_snapshot(self, server, name=None):
thing_id=image_id, thing_id_param='id',
cleanup_callable=self.delete_wrapper,
cleanup_args=[_image_client.delete_image, image_id])
snapshot_image = _image_client.get_image_meta(image_id)
snapshot_image = _image_client.check_image(image_id)

bdm = snapshot_image.get('properties', {}).get('block_device_mapping')
if bdm:
Expand Down
16 changes: 6 additions & 10 deletions tempest/services/image/v1/json/images_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,22 +198,24 @@ def list_images(self, detail=False, **kwargs):
body = json.loads(body)
return rest_client.ResponseBody(resp, body)

def get_image_meta(self, image_id):
def check_image(self, image_id):
"""Check image metadata."""
url = 'v1/images/%s' % image_id
resp, __ = self.head(url)
self.expected_success(200, resp.status)
body = self._image_meta_from_headers(resp)
return rest_client.ResponseBody(resp, body)

def show_image(self, image_id):
"""Get image details plus the image itself."""
url = 'v1/images/%s' % image_id
resp, body = self.get(url)
self.expected_success(200, resp.status)
return rest_client.ResponseBodyData(resp, body)

def is_resource_deleted(self, id):
try:
if self.get_image_meta(id)['status'] == 'deleted':
if self.check_image(id)['status'] == 'deleted':
return True
except lib_exc.NotFound:
return True
Expand Down Expand Up @@ -257,17 +259,11 @@ def delete_member(self, member_id, image_id):
self.expected_success(204, resp.status)
return rest_client.ResponseBody(resp)

# NOTE(afazekas): just for the wait function
def _get_image_status(self, image_id):
meta = self.get_image_meta(image_id)
status = meta['status']
return status

# NOTE(afazkas): Wait reinvented again. It is not in the correct layer
def wait_for_image_status(self, image_id, status):
"""Waits for a Image to reach a given status."""
start_time = time.time()
old_value = value = self._get_image_status(image_id)
old_value = value = self.check_image(image_id)['status']
while True:
dtime = time.time() - start_time
time.sleep(self.build_interval)
Expand All @@ -292,4 +288,4 @@ def wait_for_image_status(self, image_id, status):
raise exceptions.TimeoutException(message)
time.sleep(self.build_interval)
old_value = value
value = self._get_image_status(image_id)
value = self.check_image(image_id)['status']

0 comments on commit 9d28a0f

Please sign in to comment.