openstack/tempest
Code Issues Proposed changes

Merge "Merge common properties on list_images"

Browse Source
This commit is contained in:
Jenkins 2016-06-23 14:01:57 +00:00 committed by Gerrit Code Review
commit 2fa41e19b9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tempest/api/compute/servers/test_server_actions.py
View File

@ -375,17 +375,18 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
'backup_type': "daily",
'instance_uuid': self.server_id,
}
params = {
'status': 'active',
'sort_key': 'created_at',
'sort_dir': 'asc'
}
if CONF.image_feature_enabled.api_v1:
params = dict(
properties=properties, status='active',
sort_key='created_at', sort_dir='asc',)
params.update({'properties': properties})
image_list = glance_client.list_images(
detail=True,
**params)['images']
else:
# Additional properties are flattened in glance v2.
params = dict(
status='active', sort_key='created_at', sort_dir='asc')
params.update(properties)
image_list = glance_client.list_images(params)['images']