diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-07 15:07:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-07 15:07:14 +0000 |
| commit | ee98cb983a9b03d92a64127cbf15e20dc2fce2f1 (patch) | |
| tree | 74218070d2e5323c5dbf5e785cab7d3deb673d21 | |
| parent | 00988d4030b6427385a0173c63e2a52dac8fc900 (diff) | |
| parent | 60ef8b08fe183b5e4686a999da8a988ec7cca5a7 (diff) | |
| download | python-openstackclient-ee98cb983a9b03d92a64127cbf15e20dc2fce2f1.tar.gz | |
Merge "Change volume create --snapshot-id to --snapshot"
| -rw-r--r-- | doc/source/command-objects/volume.rst | 6 | ||||
| -rw-r--r-- | openstackclient/volume/v1/volume.py | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/doc/source/command-objects/volume.rst b/doc/source/command-objects/volume.rst index 0b2e0db6..3baae5d8 100644 --- a/doc/source/command-objects/volume.rst +++ b/doc/source/command-objects/volume.rst @@ -14,7 +14,7 @@ Create new volume os volume create --size <size> - [--snapshot-id <snapshot-id>] + [--snapshot <snapshot>] [--description <description>] [--type <volume-type>] [--user <user>] @@ -29,9 +29,9 @@ Create new volume New volume size in GB -.. option:: --snapshot-id <snapshot-id> +.. option:: --snapshot <snapshot> - Use <snapshot-id> as source of new volume + Use <snapshot> as source of new volume .. option:: --description <description> diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py index 3d26a5e9..ad9671e3 100644 --- a/openstackclient/volume/v1/volume.py +++ b/openstackclient/volume/v1/volume.py @@ -15,6 +15,7 @@ """Volume v1 Volume action implementations""" +import argparse import logging import six @@ -45,10 +46,16 @@ class CreateVolume(show.ShowOne): type=int, help='New volume size in GB', ) - parser.add_argument( + snapshot_group = parser.add_mutually_exclusive_group() + snapshot_group.add_argument( + '--snapshot', + metavar='<snapshot>', + help='Use <snapshot> as source of new volume', + ) + snapshot_group.add_argument( '--snapshot-id', metavar='<snapshot-id>', - help='Use <snapshot-id> as source of new volume', + help=argparse.SUPPRESS, ) parser.add_argument( '--description', @@ -130,9 +137,11 @@ class CreateVolume(show.ShowOne): parsed_args.image, ).id + snapshot = parsed_args.snapshot or parsed_args.snapshot_id + volume = volume_client.volumes.create( parsed_args.size, - parsed_args.snapshot_id, + snapshot, source_volume, parsed_args.name, parsed_args.description, |