Fix of wrong parsing of flavour name and disk_over_commit parameter

In assertion of names of flavors there was wrongly used parameter
of name. Instead of server['original_name'] we should use
server['flavor']['original_name'].

Also parameter disk_over_commit in function live_migrate_server
is available until version 2.25[1], so we should check microversion
before using this parameter.

[1] - https://docs.openstack.org/api-ref/compute/#live-migrate-server-os-migratelive-action

Change-Id: I8f03751815021ef6d335c1d90b3f183e178ce7dc
This commit is contained in:
jskunda 2023-11-15 15:03:12 +01:00
parent cc0e9b1817
commit 4e49975c9f

View File

@ -206,7 +206,7 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
self.assertEqual(resize_flavor, server['flavor']['id'])
else:
flavor = self.flavors_client.show_flavor(resize_flavor)['flavor']
self.assertEqual(flavor['name'], server['original_name'])
self.assertEqual(flavor['name'], server['flavor']['original_name'])
for key in ['ram', 'vcpus', 'disk']:
self.assertEqual(flavor[key], server['flavor'][key])
self._wait_server_status_and_check_network_connectivity(
@ -261,9 +261,18 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
floating_ip['floating_ip_address'])
self.useFixture(downtime_meter)
migration_kwargs = {'host': None, 'block_migration': block_migration}
# check if microversion is less than 2.25 because of
# disk_over_commit is depracted since compute api version 2.25
# if min_microversion is None, it runs on version < 2.25
if (CONF.compute.min_microversion is None or
CONF.compute.min_microversion < 2.25):
migration_kwargs['disk_over_commit'] = False
self.admin_servers_client.live_migrate_server(
server['id'], host=None, block_migration=block_migration,
disk_over_commit=False)
server['id'], **migration_kwargs)
waiters.wait_for_server_status(self.servers_client,
server['id'], 'ACTIVE')