From d6121782d3aa6a95b883220b27a154e641b61f7f Mon Sep 17 00:00:00 2001
From: Artom Lifshitz <alifshit@redhat.com>
Date: Thu, 12 Jul 2018 14:34:51 -0400
Subject: Don't sent disk_over_commit if nova api > 2.24

In API microversion 2.25 Nova removed the disk_over_commit parameter
to the live migration server action. This patch makes sure that we
don't include it in our request if we're running with 2.25 or higher.

Story: #2002963
Task: #22966
Change-Id: I1bbdd33be96d82422a05982508e370237c3560f3
---
 openstackclient/compute/v2/server.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'openstackclient/compute/v2')

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 777f7744..a6a59084 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -21,6 +21,7 @@ import io
 import logging
 import os
 
+from novaclient import api_versions
 from novaclient.v2 import servers
 from osc_lib.cli import parseractions
 from osc_lib.command import command
@@ -1384,11 +1385,13 @@ class MigrateServer(command.Command):
             parsed_args.server,
         )
         if parsed_args.live:
-            server.live_migrate(
-                host=parsed_args.live,
-                block_migration=parsed_args.block_migration,
-                disk_over_commit=parsed_args.disk_overcommit,
-            )
+            kwargs = {
+                'host': parsed_args.live,
+                'block_migration': parsed_args.block_migration
+            }
+            if compute_client.api_version < api_versions.APIVersion('2.25'):
+                kwargs['disk_over_commit'] = parsed_args.disk_overcommit
+            server.live_migrate(**kwargs)
         else:
             if parsed_args.block_migration or parsed_args.disk_overcommit:
                 raise exceptions.CommandError("--live must be specified if "
-- 
cgit v1.2.1