diff options
| author | David Moreau Simard <dms@redhat.com> | 2015-12-09 16:18:54 -0500 |
|---|---|---|
| committer | Tang Chen <tangchen@cn.fujitsu.com> | 2015-12-11 15:34:26 +0800 |
| commit | a5267772186add4e37c454c5a97d0ea3a1c88a81 (patch) | |
| tree | 75034d9478d2a80997dda31c118a6a88346a7e26 /openstackclient/compute | |
| parent | f65f82e4350757fcae93891c42ed8b01bb8577f2 (diff) | |
| download | python-openstackclient-a5267772186add4e37c454c5a97d0ea3a1c88a81.tar.gz | |
Make --image parameter optional in "server rebuild"
The command will now default to the image currently in-use by
the server, effectively making the --image parameter optional.
This commit also adds basic tests for ServerRebuild since there
wasn't any. Will add more full tests for it.
Change-Id: I733fd3ad5a825f06563c72aa430122e1a0e3b3b0
Closes-bug: #1524406
Co-Authored-By: David Moreau Simard <dms@redhat.com>
Co-Authored-By: Tang Chen <tangchen@cn.fujitsu.com>
Diffstat (limited to 'openstackclient/compute')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 9e2721fb..6dce8ed5 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -1096,8 +1096,8 @@ class RebuildServer(show.ShowOne): parser.add_argument( '--image', metavar='<image>', - required=True, - help=_('Recreate server from this image'), + help=_('Recreate server from the specified image (name or ID).' + ' Defaults to the currently used one.'), ) parser.add_argument( '--password', @@ -1115,12 +1115,13 @@ class RebuildServer(show.ShowOne): def take_action(self, parsed_args): compute_client = self.app.client_manager.compute - # Lookup parsed_args.image - image = utils.find_resource(compute_client.images, parsed_args.image) - server = utils.find_resource( compute_client.servers, parsed_args.server) + # If parsed_args.image is not set, default to the currently used one. + image_id = parsed_args.image or server._info.get('image', {}).get('id') + image = utils.find_resource(compute_client.images, image_id) + server = server.rebuild(image, parsed_args.password) if parsed_args.wait: if utils.wait_for_status( |