commit 1b0b6b934e3e17a40104b7bf6f8f3c0de314898d
author Vasyl Saienko <vsaienko@mirantis.com> Tue Nov 15 21:55:41 2022 +0000
committer Vasyl Saienko <vsaienko@mirantis.com> Wed Nov 16 08:30:12 2022 +0000
tree 2bc9d97c4b15ca50efe7adf514f813a16b0b9190
parent 3078417e6c719d071d1da2342164427bdad2b25c

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

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index d298361..495b034 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -30,6 +30,7 @@
 from tempest.common import waiters
 from tempest import config
 from tempest import exceptions
+from tempest.lib.common import api_version_request
 from tempest.lib.common import api_version_utils
 from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils
@@ -812,7 +813,9 @@
         LOG.debug("Creating a snapshot image for server: %s", server['name'])
         image = _images_client.create_image(server['id'], name=name, **kwargs)
 
-        if self.compute_min_microversion >= '2.60':
+        if (api_version_request.APIVersionRequest(
+                self.compute_min_microversion) >=
+            api_version_request.APIVersionRequest('2.60')):
             image_id = image['image_id']
         else:
             image_id = image.response['location'].split('images/')[1]

tempest/scenario/test_network_advanced_server_ops.py

diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py
index dc19e89..4f35641 100644
--- a/tempest/scenario/test_network_advanced_server_ops.py
+++ b/tempest/scenario/test_network_advanced_server_ops.py
@@ -18,6 +18,7 @@
 from tempest.common import utils
 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
 
@@ -253,12 +254,15 @@
         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'])
+        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')