diff options
| author | gustavo panizzo <gfa@zumbi.com.ar> | 2015-01-27 13:50:06 +0800 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2015-01-27 10:15:11 +0000 |
| commit | 7a6a6ae6e2d9a7b617b649e78b99140b8a0e7677 (patch) | |
| tree | 74c318798eb9960874886ceecb4a17df9420a023 /openstackclient/image | |
| parent | dde65464cc85d825086846c21a9a05ab76dcf335 (diff) | |
1.0.2-1 (patches unapplied)import/1.0.2-1
Imported using git-ubuntu import.
Notes
Notes:
* New upstream release.
Diffstat (limited to 'openstackclient/image')
| -rw-r--r-- | openstackclient/image/v1/image.py | 38 | ||||
| -rw-r--r-- | openstackclient/image/v2/image.py | 26 |
2 files changed, 34 insertions, 30 deletions
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py index 32dd388..d7ece25 100644 --- a/openstackclient/image/v1/image.py +++ b/openstackclient/image/v1/image.py @@ -49,7 +49,7 @@ class CreateImage(show.ShowOne): parser = super(CreateImage, self).get_parser(prog_name) parser.add_argument( "name", - metavar="<name>", + metavar="<image-name>", help="New image name", ) parser.add_argument( @@ -159,7 +159,7 @@ class CreateImage(show.ShowOne): dest="properties", metavar="<key=value>", action=parseractions.KeyValueAction, - help="Set an image property " + help="Set a property on this image " "(repeat option to set multiple properties)", ) return parser @@ -262,16 +262,17 @@ class CreateImage(show.ShowOne): class DeleteImage(command.Command): - """Delete an image""" + """Delete image(s)""" log = logging.getLogger(__name__ + ".DeleteImage") def get_parser(self, prog_name): parser = super(DeleteImage, self).get_parser(prog_name) parser.add_argument( - "image", + "images", metavar="<image>", - help="Name or ID of image to delete", + nargs="+", + help="Image(s) to delete (name or ID)", ) return parser @@ -279,11 +280,12 @@ class DeleteImage(command.Command): self.log.debug("take_action(%s)", parsed_args) image_client = self.app.client_manager.image - image = utils.find_resource( - image_client.images, - parsed_args.image, - ) - image_client.images.delete(image.id) + for image in parsed_args.images: + image_obj = utils.find_resource( + image_client.images, + image, + ) + image_client.images.delete(image_obj.id) class ListImage(lister.Lister): @@ -335,12 +337,12 @@ class SaveImage(command.Command): parser.add_argument( "--file", metavar="<filename>", - help="Downloaded image save filename [default: stdout]", + help="Downloaded image save filename (default: stdout)", ) parser.add_argument( "image", metavar="<image>", - help="Name or ID of image to save", + help="Image to save (name or ID)", ) return parser @@ -358,7 +360,7 @@ class SaveImage(command.Command): class SetImage(show.ShowOne): - """Change image properties""" + """Set image properties""" log = logging.getLogger(__name__ + ".SetImage") @@ -367,7 +369,7 @@ class SetImage(show.ShowOne): parser.add_argument( "image", metavar="<image>", - help="Image name or ID to change", + help="Image to modify (name or ID)", ) parser.add_argument( "--name", @@ -377,7 +379,7 @@ class SetImage(show.ShowOne): parser.add_argument( "--owner", metavar="<project>", - help="New image owner project name or ID", + help="New image owner project (name or ID)", ) parser.add_argument( "--min-disk", @@ -418,7 +420,7 @@ class SetImage(show.ShowOne): dest="properties", metavar="<key=value>", action=parseractions.KeyValueAction, - help="Set an image property " + help="Set a property on this image " "(repeat option to set multiple properties)", ) return parser @@ -472,7 +474,7 @@ class SetImage(show.ShowOne): class ShowImage(show.ShowOne): - """Show image details""" + """Display image details""" log = logging.getLogger(__name__ + ".ShowImage") @@ -481,7 +483,7 @@ class ShowImage(show.ShowOne): parser.add_argument( "image", metavar="<image>", - help="Name or ID of image to display", + help="Image to display (name or ID)", ) return parser diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py index c12ff11..d5ee692 100644 --- a/openstackclient/image/v2/image.py +++ b/openstackclient/image/v2/image.py @@ -27,16 +27,17 @@ from openstackclient.common import utils class DeleteImage(command.Command): - """Delete an image""" + """Delete image(s)""" log = logging.getLogger(__name__ + ".DeleteImage") def get_parser(self, prog_name): parser = super(DeleteImage, self).get_parser(prog_name) parser.add_argument( - "image", + "images", metavar="<image>", - help="Name or ID of image to delete", + nargs="+", + help="Image(s) to delete (name or ID)", ) return parser @@ -44,11 +45,12 @@ class DeleteImage(command.Command): self.log.debug("take_action(%s)", parsed_args) image_client = self.app.client_manager.image - image = utils.find_resource( - image_client.images, - parsed_args.image, - ) - image_client.images.delete(image.id) + for image in parsed_args.images: + image_obj = utils.find_resource( + image_client.images, + image, + ) + image_client.images.delete(image_obj.id) class ListImage(lister.Lister): @@ -100,12 +102,12 @@ class SaveImage(command.Command): parser.add_argument( "--file", metavar="<filename>", - help="Downloaded image save filename [default: stdout]", + help="Downloaded image save filename (default: stdout)", ) parser.add_argument( "image", metavar="<image>", - help="Name or ID of image to save", + help="Image to save (name or ID)", ) return parser @@ -123,7 +125,7 @@ class SaveImage(command.Command): class ShowImage(show.ShowOne): - """Show image details""" + """Display image details""" log = logging.getLogger(__name__ + ".ShowImage") @@ -132,7 +134,7 @@ class ShowImage(show.ShowOne): parser.add_argument( "image", metavar="<image>", - help="Name or ID of image to display", + help="Image to display (name or ID)", ) return parser |