diff options
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v2_0/catalog.py | 19 | ||||
| -rw-r--r-- | openstackclient/identity/v2_0/service.py | 6 | ||||
| -rw-r--r-- | openstackclient/identity/v3/service.py | 32 |
3 files changed, 32 insertions, 25 deletions
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py index 1a96fdf6..dfc99b47 100644 --- a/openstackclient/identity/v2_0/catalog.py +++ b/openstackclient/identity/v2_0/catalog.py @@ -83,17 +83,12 @@ class ShowCatalog(show.ShowOne): data = None for service in sc.get_data(): - if ( - 'name' in service and - service['name'] != parsed_args.service and - 'type' in service and - service['type'] != parsed_args.service - ): - continue - - data = service - data['endpoints'] = _format_endpoints(data['endpoints']) - if 'endpoints_links' in data: - data.pop('endpoints_links') + if (service.get('name') == parsed_args.service or + service.get('type') == parsed_args.service): + data = service + data['endpoints'] = _format_endpoints(data['endpoints']) + if 'endpoints_links' in data: + data.pop('endpoints_links') + break return zip(*sorted(six.iteritems(data))) diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py index 0b98a903..208f7fbc 100644 --- a/openstackclient/identity/v2_0/service.py +++ b/openstackclient/identity/v2_0/service.py @@ -44,7 +44,7 @@ class CreateService(show.ShowOne): type_or_name_group = parser.add_mutually_exclusive_group() type_or_name_group.add_argument( '--type', - metavar='<service-type>', + metavar='<type>', help=argparse.SUPPRESS, ) type_or_name_group.add_argument( @@ -54,7 +54,7 @@ class CreateService(show.ShowOne): ) parser.add_argument( '--description', - metavar='<service-description>', + metavar='<description>', help=_('New service description'), ) return parser @@ -144,7 +144,7 @@ class ListService(lister.Lister): class ShowService(show.ShowOne): - """Show service details""" + """Display service details""" log = logging.getLogger(__name__ + '.ShowService') diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py index f4c5d426..12629253 100644 --- a/openstackclient/identity/v3/service.py +++ b/openstackclient/identity/v3/service.py @@ -15,6 +15,7 @@ """Identity v3 Service action implementations""" +import argparse import logging import six @@ -35,12 +36,12 @@ class CreateService(show.ShowOne): parser = super(CreateService, self).get_parser(prog_name) parser.add_argument( 'type', - metavar='<service-type>', + metavar='<type>', help='New service type (compute, image, identity, volume, etc)', ) parser.add_argument( '--name', - metavar='<service-name>', + metavar='<name>', help='New service name', ) parser.add_argument( @@ -52,12 +53,12 @@ class CreateService(show.ShowOne): enable_group.add_argument( '--enable', action='store_true', - help='Enable project', + help='Enable service (default)', ) enable_group.add_argument( '--disable', action='store_true', - help='Disable project', + help='Disable service', ) return parser @@ -90,7 +91,7 @@ class DeleteService(command.Command): parser.add_argument( 'service', metavar='<service>', - help='Service to delete (name or ID)', + help='Service to delete (type or ID)', ) return parser @@ -109,6 +110,17 @@ class ListService(lister.Lister): log = logging.getLogger(__name__ + '.ListService') + def get_parser(self, prog_name): + """The --long option is here for compatibility only.""" + parser = super(ListService, self).get_parser(prog_name) + parser.add_argument( + '--long', + action='store_true', + default=False, + help=argparse.SUPPRESS, + ) + return parser + def take_action(self, parsed_args): self.log.debug('take_action(%s)', parsed_args) @@ -131,11 +143,11 @@ class SetService(command.Command): parser.add_argument( 'service', metavar='<service>', - help='Service to update (name or ID)', + help='Service to update (type, name or ID)', ) parser.add_argument( '--type', - metavar='<service-type>', + metavar='<type>', help='New service type (compute, image, identity, volume, etc)', ) parser.add_argument( @@ -152,12 +164,12 @@ class SetService(command.Command): enable_group.add_argument( '--enable', action='store_true', - help='Enable project', + help='Enable service', ) enable_group.add_argument( '--disable', action='store_true', - help='Disable project', + help='Disable service', ) return parser @@ -194,7 +206,7 @@ class SetService(command.Command): class ShowService(show.ShowOne): - """Show service details""" + """Display service details""" log = logging.getLogger(__name__ + '.ShowService') |