From ea2ac77a46b9bed87bbff902c093c1e8a43693af Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 7 Jul 2014 11:42:37 -0500
Subject: Fix server resize

So apparently we've never resized a server???

Fixed command args and add some tests.

Change-Id: I6c3f6fec22390e9d269b7117a42a190d2b4b80ba
---
 openstackclient/compute/v2/server.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'openstackclient/compute')

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 2dcc7ae9..a4ed6fa4 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -938,27 +938,32 @@ class RescueServer(show.ShowOne):
 
 
 class ResizeServer(command.Command):
-    """Convert server to a new flavor"""
+    """Scale server to a new flavor"""
 
     log = logging.getLogger(__name__ + '.ResizeServer')
 
     def get_parser(self, prog_name):
         parser = super(ResizeServer, self).get_parser(prog_name)
         phase_group = parser.add_mutually_exclusive_group()
+        parser.add_argument(
+            'server',
+            metavar='<server>',
+            help='Server (name or ID)',
+        )
         phase_group.add_argument(
             '--flavor',
             metavar='<flavor>',
-            help='Resize server to this flavor',
+            help='Resize server to specified flavor',
         )
         phase_group.add_argument(
             '--verify',
             action="store_true",
-            help='Verify previous server resize',
+            help='Verify server resize is complete',
         )
         phase_group.add_argument(
             '--revert',
             action="store_true",
-            help='Restore server before resize',
+            help='Restore server state before resize',
         )
         parser.add_argument(
             '--wait',
@@ -980,7 +985,7 @@ class ResizeServer(command.Command):
                 compute_client.flavors,
                 parsed_args.flavor,
             )
-            server.resize(flavor)
+            compute_client.servers.resize(server, flavor)
             if parsed_args.wait:
                 if utils.wait_for_status(
                     compute_client.servers.get,
@@ -993,9 +998,9 @@ class ResizeServer(command.Command):
                     sys.stdout.write('\nError resizing server')
                     raise SystemExit
         elif parsed_args.verify:
-            server.confirm_resize()
+            compute_client.servers.confirm_resize(server)
         elif parsed_args.revert:
-            server.revert_resize()
+            compute_client.servers.revert_resize(server)
 
 
 class ResumeServer(command.Command):
-- 
cgit v1.2.1