diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-19 22:46:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-19 22:46:43 +0000 |
| commit | 0f74e80c4b444afbc8b57002773de39e8d7b0019 (patch) | |
| tree | 05fe84560812cb6ec961fff3ca34e3cc323e0d0d /openstackclient/volume | |
| parent | d3e2e35f1dd2f1a46da58e09b36025392fc62653 (diff) | |
| parent | 195a0edeb77607cd95899834e5813ef34ada7c0c (diff) | |
| download | python-openstackclient-0f74e80c4b444afbc8b57002773de39e8d7b0019.tar.gz | |
Merge "Follow-on for volume list - add tests, clean help"
Diffstat (limited to 'openstackclient/volume')
| -rw-r--r-- | openstackclient/volume/v1/volume.py | 10 | ||||
| -rw-r--r-- | openstackclient/volume/v2/volume.py | 15 |
2 files changed, 12 insertions, 13 deletions
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 @@ -207,16 +207,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', default=False, 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 @@ -201,12 +200,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>', help='Filter results by project (name or ID) (admin only)' @@ -221,7 +214,7 @@ 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', @@ -229,6 +222,12 @@ class ListVolume(lister.Lister): 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', default=False, |