summaryrefslogtreecommitdiff
path: root/openstackclient/volume
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-08 17:44:42 +0000
committerGerrit Code Review <review@openstack.org>2016-12-08 17:44:42 +0000
commitb18dcfc4cbaadc30a27550a2bb30f94200645b06 (patch)
tree6a7036b1fd5c8c46f0c22795526feb87a7e58075 /openstackclient/volume
parenta9be7a6c731c4f590004812a3b3737ea266e8fc2 (diff)
parent3e9109bc7c9511b45568b299da897d977852d76d (diff)
downloadpython-openstackclient-b18dcfc4cbaadc30a27550a2bb30f94200645b06.tar.gz
Merge "Add "consistency-group-snapshot" option to consistency group create"
Diffstat (limited to 'openstackclient/volume')
-rw-r--r--openstackclient/volume/v2/consistency_group.py23
1 files changed, 17 insertions, 6 deletions
diff --git a/openstackclient/volume/v2/consistency_group.py b/openstackclient/volume/v2/consistency_group.py
index 661bcbe5..fbeae745 100644
--- a/openstackclient/volume/v2/consistency_group.py
+++ b/openstackclient/volume/v2/consistency_group.py
@@ -94,6 +94,11 @@ class CreateConsistencyGroup(command.ShowOne):
metavar="<consistency-group>",
help=_("Existing consistency group (name or ID)")
)
+ exclusive_group.add_argument(
+ "--consistency-group-snapshot",
+ metavar="<consistency-group-snapshot>",
+ help=_("Existing consistency group snapshot (name or ID)")
+ )
parser.add_argument(
"--description",
metavar="<description>",
@@ -120,17 +125,23 @@ class CreateConsistencyGroup(command.ShowOne):
description=parsed_args.description,
availability_zone=parsed_args.availability_zone
)
- elif parsed_args.consistency_group_source:
+ else:
if parsed_args.availability_zone:
msg = _("'--availability-zone' option will not work "
"if creating consistency group from source")
LOG.warning(msg)
- consistency_group_id = utils.find_resource(
- volume_client.consistencygroups,
- parsed_args.consistency_group_source).id
+
+ consistency_group_id = None
consistency_group_snapshot = None
- # TODO(Huanxuan Ao): Support for creating from consistency group
- # snapshot after adding "consistency_group_snapshot" resource
+ if parsed_args.consistency_group_source:
+ consistency_group_id = utils.find_resource(
+ volume_client.consistencygroups,
+ parsed_args.consistency_group_source).id
+ elif parsed_args.consistency_group_snapshot:
+ consistency_group_snapshot = utils.find_resource(
+ volume_client.cgsnapshots,
+ parsed_args.consistency_group_snapshot).id
+
consistency_group = (
volume_client.consistencygroups.create_from_src(
consistency_group_snapshot,