Merge "compute: Don't warn if disk overcommit params unset"

2 files changed, 16 insertions, 12 deletions

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 380c0649..a46fb904 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -2691,7 +2691,7 @@ revert to release the new server and restart the old one.""")
         disk_group.add_argument(
             '--disk-overcommit',
             action='store_true',
-            default=False,
+            default=None,
             help=_(
                 'Allow disk over-commit on the destination host'
                 '(supported with --os-compute-api-version 2.24 or below)'
@@ -2701,7 +2701,6 @@ revert to release the new server and restart the old one.""")
             '--no-disk-overcommit',
             dest='disk_overcommit',
             action='store_false',
-            default=False,
             help=_(
                 'Do not over-commit disk on the destination host (default)'
                 '(supported with --os-compute-api-version 2.24 or below)'
@@ -2763,6 +2762,11 @@ revert to release the new server and restart the old one.""")
 
             if compute_client.api_version < api_versions.APIVersion('2.25'):
                 kwargs['disk_over_commit'] = parsed_args.disk_overcommit
+                # We can't use an argparse default value because then we can't
+                # distinguish between explicit 'False' and unset for the below
+                # case (microversion >= 2.25)
+                if kwargs['disk_over_commit'] is None:
+                    kwargs['disk_over_commit'] = False
             elif parsed_args.disk_overcommit is not None:
                 # TODO(stephenfin): Raise an error here in OSC 7.0
                 msg = _(
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 14b26d13..50fdef28 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -5251,7 +5251,7 @@ class TestServerMigrate(TestServer):
         verifylist = [
             ('live_migration', False),
             ('block_migration', None),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -5273,7 +5273,7 @@ class TestServerMigrate(TestServer):
             ('live_migration', False),
             ('host', 'fakehost'),
             ('block_migration', None),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -5295,7 +5295,7 @@ class TestServerMigrate(TestServer):
         verifylist = [
             ('live_migration', False),
             ('block_migration', True),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -5336,7 +5336,7 @@ class TestServerMigrate(TestServer):
             ('live_migration', False),
             ('host', 'fakehost'),
             ('block_migration', None),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -5362,7 +5362,7 @@ class TestServerMigrate(TestServer):
             ('live_migration', True),
             ('host', None),
             ('block_migration', None),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -5386,7 +5386,7 @@ class TestServerMigrate(TestServer):
             ('live_migration', True),
             ('host', 'fakehost'),
             ('block_migration', None),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -5414,7 +5414,7 @@ class TestServerMigrate(TestServer):
             ('live_migration', True),
             ('host', 'fakehost'),
             ('block_migration', None),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -5441,7 +5441,7 @@ class TestServerMigrate(TestServer):
         verifylist = [
             ('live_migration', True),
             ('block_migration', True),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -5527,7 +5527,7 @@ class TestServerMigrate(TestServer):
         verifylist = [
             ('live_migration', False),
             ('block_migration', None),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -5547,7 +5547,7 @@ class TestServerMigrate(TestServer):
         verifylist = [
             ('live_migration', False),
             ('block_migration', None),
-            ('disk_overcommit', False),
+            ('disk_overcommit', None),
             ('wait', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)