diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-05-28 22:05:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-05-28 22:05:53 +0000 |
| commit | 7ceff0eafc01c038ac5264d91701ee6384ff0b31 (patch) | |
| tree | f20e707a3a7ab911f4ea06103b2c3ccaa856de2b /openstackclient | |
| parent | 870e7ddbcce5d5f1b1bd36bb3ad95665565b3ced (diff) | |
| parent | da5e31dbb629c26f54e476ca3587455c3a17cdcb (diff) | |
| download | python-openstackclient-7ceff0eafc01c038ac5264d91701ee6384ff0b31.tar.gz | |
Merge "Fix server image create"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 8 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 808741fd..9cff03d6 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -393,7 +393,7 @@ class CreateServerImage(show.ShowOne): parser = super(CreateServerImage, self).get_parser(prog_name) parser.add_argument( 'server', - metavar='<server', + metavar='<server>', help='Server (name or ID)', ) parser.add_argument( @@ -421,7 +421,7 @@ class CreateServerImage(show.ShowOne): else: name = server.name - image = compute_client.servers.create_image( + image_id = compute_client.servers.create_image( server, name, ) @@ -429,7 +429,7 @@ class CreateServerImage(show.ShowOne): if parsed_args.wait: if utils.wait_for_status( image_client.images.get, - image, + image_id, callback=_show_progress, ): sys.stdout.write('\n') @@ -443,7 +443,7 @@ class CreateServerImage(show.ShowOne): image = utils.find_resource( image_client.images, - image.id, + image_id, ) info = {} diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py index 4cd294cc..efe4c58b 100644 --- a/openstackclient/tests/compute/v2/test_server.py +++ b/openstackclient/tests/compute/v2/test_server.py @@ -80,11 +80,7 @@ class TestServerImageCreate(TestServer): loaded=True, ) - self.servers_mock.create_image.return_value = fakes.FakeResource( - None, - copy.deepcopy(image_fakes.IMAGE), - loaded=True, - ) + self.servers_mock.create_image.return_value = image_fakes.image_id self.images_mock.get.return_value = fakes.FakeResource( None, |