Pass block_migration only for needed microversion < 2.25
The block_migration is available prior 2.25 api microversion.
* Fix api version comparison
Related-Prod: PRODX-28392
Change-Id: I885bb185f704213413f15fff069e4c5b80775227
diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py
index a219676..0bcda89 100644
--- a/tempest/scenario/test_network_advanced_server_ops.py
+++ b/tempest/scenario/test_network_advanced_server_ops.py
@@ -20,6 +20,7 @@
from tempest.common.utils import net_downtime
from tempest.common import waiters
from tempest import config
+from tempest.lib.common import api_version_request
from tempest.lib import decorators
from tempest.scenario import manager
@@ -257,17 +258,20 @@
self._wait_server_status_and_check_network_connectivity(
server, keypair, floating_ip)
- block_migration = (CONF.compute_feature_enabled.
- block_migration_for_live_migration)
old_host = self.get_host_for_server(server['id'])
downtime_meter = net_downtime.NetDowntimeMeter(
floating_ip['floating_ip_address'])
self.useFixture(downtime_meter)
+ migrate_kwargs = {"block_migration": (
+ CONF.compute_feature_enabled.block_migration_for_live_migration)}
+ if (api_version_request.APIVersionRequest(
+ self.compute_min_microversion) <
+ api_version_request.APIVersionRequest('2.25')):
+ migrate_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'], host=None, **migrate_kwargs)
waiters.wait_for_server_status(self.servers_client,
server['id'], 'ACTIVE')