From 9f51ccdf8c2b2e1afceeb9e6570ed629191a71c8 Mon Sep 17 00:00:00 2001
From: kafka <guowang@unitedstack.com>
Date: Wed, 12 Aug 2015 12:22:41 +0800
Subject: Add filtering by project/user for 'openstack volume list'

added project, user and domain options for filtering results,
also cleaned up the order to match the docs.

Co-Authored-By: Steve Martinelli <stevemar@ca.ibm.com>

Closed-bug: #1483976
Change-Id: I9d955094d31d4a28e215d24f7521a11c62bee8db
---
 doc/source/command-objects/volume.rst | 30 ++++++++++++++++++++++++------
 1 file changed, 24 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 556d1645..c94cbd23 100644
--- a/doc/source/command-objects/volume.rst
+++ b/doc/source/command-objects/volume.rst
@@ -102,22 +102,40 @@ List volumes
 .. code:: bash
 
     os volume list
-        [--status <status>]
-        [--name <name>]
         [--all-projects]
+        [--project <project> [--project-domain <project-domain>]]
+        [--user <user> [--user-domain <user-domain>]]
+        [--name <name>]
+        [--status <status>]
         [--long]
 
-.. option:: --status <status>
+.. option:: --all-projects
 
-    Filter results by status
+.. option:: --project <project>
+
+    Filter results by project (name or ID) (admin only)
+
+.. option:: --project-domain <project-domain>
+
+    Domain the project belongs to (name or ID).
+    This can be used in case collisions between project names exist.
+
+.. option:: --user <user>
+
+    Filter results by user (name or ID) (admin only)
+
+.. option:: --user-domain <user-domain>
+
+    Domain the user belongs to (name or ID).
+    This can be used in case collisions between user names exist.
 
 .. option:: --name <name>
 
     Filter results by name
 
-.. option:: --all-projects
+.. option:: --status <status>
 
-    Include all projects (admin only)
+    Filter results by status
 
 .. option:: --long
 
-- 
cgit v1.2.1