From 195a0edeb77607cd95899834e5813ef34ada7c0c Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 16 Oct 2015 16:02:07 -0500
Subject: Follow-on for volume list - add tests, clean help

* Add volume list tests for v1 (a copy of the v2 tests)
* Converts volume v2 tests to use Identity v3 so domains can be tested
* Add volume list (v2) tests for new options
* Re-orders volume list options (both v1 and v2) to match
* MArks the new volume list (v2) options as v2-only in doc

Change-Id: I2181b2c48cfde2147d7d0ef135322df8a81e7ce8
---
 openstackclient/volume/v1/volume.py | 10 +++++-----
 openstackclient/volume/v2/volume.py | 15 +++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'openstackclient/volume')

diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index 52b0eb2e..92afe8b0 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -206,16 +206,16 @@ class ListVolume(lister.Lister):
 
     def get_parser(self, prog_name):
         parser = super(ListVolume, self).get_parser(prog_name)
+        parser.add_argument(
+            '--name',
+            metavar='<name>',
+            help='Filter results by volume name',
+        )
         parser.add_argument(
             '--status',
             metavar='<status>',
             help='Filter results by status',
         )
-        parser.add_argument(
-            '--name',
-            metavar='<name>',
-            help='Filter results by name',
-        )
         parser.add_argument(
             '--all-projects',
             action='store_true',
diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py
index 5df65635..f59567cc 100644
--- a/openstackclient/volume/v2/volume.py
+++ b/openstackclient/volume/v2/volume.py
@@ -16,7 +16,6 @@
 
 import copy
 import logging
-import os
 
 from cliff import command
 from cliff import lister
@@ -200,12 +199,6 @@ class ListVolume(lister.Lister):
 
     def get_parser(self, prog_name):
         parser = super(ListVolume, self).get_parser(prog_name)
-        parser.add_argument(
-            '--all-projects',
-            action='store_true',
-            default=bool(int(os.environ.get("ALL_PROJECTS", 0))),
-            help='Include all projects (admin only)',
-        )
         parser.add_argument(
             '--project',
             metavar='<project-id>',
@@ -221,13 +214,19 @@ class ListVolume(lister.Lister):
         parser.add_argument(
             '--name',
             metavar='<name>',
-            help='Filter results by name',
+            help='Filter results by volume name',
         )
         parser.add_argument(
             '--status',
             metavar='<status>',
             help='Filter results by status',
         )
+        parser.add_argument(
+            '--all-projects',
+            action='store_true',
+            default=False,
+            help='Include all projects (admin only)',
+        )
         parser.add_argument(
             '--long',
             action='store_true',
-- 
cgit v1.2.1