From c9e0c01f67a00e63bb5d8b5781d7e8e87b39136c Mon Sep 17 00:00:00 2001
From: Huanxuan Ao <huanxuan.ao@easystack.cn>
Date: Tue, 27 Sep 2016 12:27:05 +0800
Subject: Add and modify options for "volume create" command

1.Add mutually exclusive options into a mutually
exclusive group.
2.Add "--source-replicated", "--consistency-group",
"--hint" and "multi-attach" options
3.Make --size option to be optional under some cases

Closes-Bug: #1568005
Closes-Bug: #1627913
Implements: bp implement-cinder-features
Co-Authored-By: Roman Vasilets <rvasilets@mirantis.com>
Change-Id: I2c4c3073195d33774e477f4d7f22e383b14b41dd
---
 doc/source/command-objects/volume.rst | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

(limited to 'doc/source/command-objects')

diff --git a/doc/source/command-objects/volume.rst b/doc/source/command-objects/volume.rst
index f772557f..8f123361 100644
--- a/doc/source/command-objects/volume.rst
+++ b/doc/source/command-objects/volume.rst
@@ -13,21 +13,23 @@ Create new volume
 .. code:: bash
 
     os volume create
-        --size <size>
+        [--size <size>]
         [--type <volume-type>]
-        [--image <image>]
-        [--snapshot <snapshot>]
-        [--source <volume>]
+        [--image <image> | --snapshot <snapshot> | --source <volume> | --source-replicated <replicated-volume>]
         [--description <description>]
         [--user <user>]
         [--project <project>]
         [--availability-zone <availability-zone>]
+        [--consistency-group <consistency-group>]
         [--property <key=value> [...] ]
+        [--hint <key=value> [...] ]
+        [--multi-attach]
         <name>
 
-.. option:: --size <size> (required)
+.. option:: --size <size>
 
     Volume size in GB
+    (Required unless --snapshot or --source or --source-replicated is specified)
 
 .. option:: --type <volume-type>
 
@@ -46,10 +48,14 @@ Create new volume
 
     Use :option:`\<snapshot\>` as source of volume (name or ID)
 
-.. option:: --source <source>
+.. option:: --source <volume>
 
     Volume to clone (name or ID)
 
+.. option:: --source-replicated <replicated-volume>
+
+    Replicated volume to clone (name or ID)
+
 .. option:: --description <description>
 
     Volume description
@@ -66,10 +72,23 @@ Create new volume
 
     Create volume in :option:`\<availability-zone\>`
 
+.. option:: --consistency-group <consistency-group>
+
+    Consistency group where the new volume belongs to
+
 .. option:: --property <key=value>
 
     Set a property on this volume (repeat option to set multiple properties)
 
+.. option:: --hint <key=value>
+
+    Arbitrary scheduler hint key-value pairs to help boot an instance
+    (repeat option to set multiple hints)
+
+.. option:: --multi-attach
+
+    Allow volume to be attached more than once (default to False)
+
 .. _volume_create-name:
 .. describe:: <name>
 
-- 
cgit v1.2.1