Merge "Rename --verify for server resize to avoid conflict"

Author: Jenkins

doc/source/command-objects/server.rst

@@ -423,16 +423,16 @@ Scale server to a new flavor
         <server>
 
     os server resize
-        --verify | --revert
+        --confirm | --revert
         <server>
 
 .. option:: --flavor <flavor>
 
     Resize server to specified flavor
 
-.. option:: --verify
+.. option:: --confirm
 
-    Verify server resize is complete
+    Confirm server resize is complete
 
 .. option:: --revert
 

openstackclient/compute/v2/server.py

@@ -1073,9 +1073,9 @@ def get_parser(self, prog_name):
             help=_('Resize server to specified flavor'),
         )
         phase_group.add_argument(
-            '--verify',
+            '--confirm',
             action="store_true",
-            help=_('Verify server resize is complete'),
+            help=_('Confirm server resize is complete'),
         )
         phase_group.add_argument(
             '--revert',
@@ -1114,7 +1114,7 @@ def take_action(self, parsed_args):
                 else:
                     sys.stdout.write(_('\nError resizing server'))
                     raise SystemExit
-        elif parsed_args.verify:
+        elif parsed_args.confirm:
             compute_client.servers.confirm_resize(server)
         elif parsed_args.revert:
             compute_client.servers.revert_resize(server)

openstackclient/tests/compute/v2/test_server.py

@@ -437,7 +437,7 @@ def test_server_resize_no_options(self):
             compute_fakes.server_id,
         ]
         verifylist = [
-            ('verify', False),
+            ('confirm', False),
             ('revert', False),
             ('server', compute_fakes.server_id),
         ]
@@ -461,7 +461,7 @@ def test_server_resize(self):
         ]
         verifylist = [
             ('flavor', compute_fakes.flavor_id),
-            ('verify', False),
+            ('confirm', False),
             ('revert', False),
             ('server', compute_fakes.server_id),
         ]
@@ -486,11 +486,11 @@ def test_server_resize(self):
 
     def test_server_resize_confirm(self):
         arglist = [
-            '--verify',
+            '--confirm',
             compute_fakes.server_id,
         ]
         verifylist = [
-            ('verify', True),
+            ('confirm', True),
             ('revert', False),
             ('server', compute_fakes.server_id),
         ]
@@ -515,7 +515,7 @@ def test_server_resize_revert(self):
             compute_fakes.server_id,
         ]
         verifylist = [
-            ('verify', False),
+            ('confirm', False),
             ('revert', True),
             ('server', compute_fakes.server_id),
         ]