openstack
/
tempest
Code Issues Proposed changes

Merge "Handle missing flavor.id in server response"

This commit is contained in:
Zuul 2018-01-22 06:49:04 +00:00 committed by Gerrit Code Review
parent 6e49bbba8e b4fdd681c3
commit feef9ef019
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tempest/api/compute/base.py
View File

@ -377,10 +377,12 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
cls.servers_client.confirm_resize_server(server_id)
waiters.wait_for_server_status(cls.servers_client, server_id, 'ACTIVE')
server = cls.servers_client.show_server(server_id)['server']
if new_flavor_id != server['flavor']['id']:
msg = ('Flavor id of %s is not equal to new_flavor_id.'
% server_id)
raise lib_exc.TempestException(msg)
# Nova API > 2.46 no longer includes flavor.id
if server['flavor'].get('id'):
if new_flavor_id != server['flavor']['id']:
msg = ('Flavor id of %s is not equal to new_flavor_id.'
% server_id)
raise lib_exc.TempestException(msg)
@classmethod
def delete_volume(cls, volume_id):