openstack/tempest
Code Issues Proposed changes

Fix flavor NotFound in test_resize_server_revert_deleted_flavor

Browse Source 
Running test_resize_server_revert_deleted_flavor with microversion > 2.46
fails with flavor NotFound error, because after microversion 2.46, 'id'
is not in server's flavor info, so we can only compare flavor details,
but if flavor is deleted, getting flavor info will throw NotFound error.
So we should save the original flavor details before flavor is deleted
for the later comparison.

Change-Id: I88cc46711d6331e7a65b17bf55e1205b333a63d0
Closes-Bug: #1892166
This commit is contained in:
zhufl 2020-08-20 09:09:06 +08:00
parent 25ec807af3
commit 4e7b2f4594
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tempest/api/compute/admin/test_migrations.py
View File

@ -94,6 +94,16 @@ class MigrationsAdminTest(base.BaseV2ComputeAdminTest):
# Now boot a server with the copied flavor. # Now boot a server with the copied flavor.
server = self.create_test_server( server = self.create_test_server(
wait_until='ACTIVE', flavor=flavor['id']) wait_until='ACTIVE', flavor=flavor['id'])
server = self.servers_client.show_server(server['id'])['server']
# If 'id' not in server['flavor'], we can only compare the flavor
# details, so here we should save the to-be-deleted flavor's details,
# for the flavor comparison after the server resizing.
if not server['flavor'].get('id'):
pre_flavor = {}
body = self.flavors_client.show_flavor(flavor['id'])['flavor']
for key in ['name', 'ram', 'vcpus', 'disk']:
pre_flavor[key] = body[key]
# Delete the flavor we used to boot the instance. # Delete the flavor we used to boot the instance.
self._flavor_clean_up(flavor['id']) self._flavor_clean_up(flavor['id'])
@ -110,7 +120,18 @@ class MigrationsAdminTest(base.BaseV2ComputeAdminTest):
'ACTIVE') 'ACTIVE')
server = self.servers_client.show_server(server['id'])['server'] server = self.servers_client.show_server(server['id'])['server']
self.assert_flavor_equal(flavor['id'], server['flavor']) if server['flavor'].get('id'):
msg = ('server flavor is not same as flavor!')
self.assertEqual(flavor['id'], server['flavor']['id'], msg)
else:
self.assertEqual(pre_flavor['name'],
server['flavor']['original_name'],
"original_name in server flavor is not same as "
"flavor name!")
for key in ['ram', 'vcpus', 'disk']:
msg = ('attribute %s in server flavor is not same as '
'flavor!' % key)
self.assertEqual(pre_flavor[key], server['flavor'][key], msg)
def _test_cold_migrate_server(self, revert=False): def _test_cold_migrate_server(self, revert=False):
if CONF.compute.min_compute_nodes < 2: if CONF.compute.min_compute_nodes < 2: