diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-13 07:45:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-13 07:45:15 +0000 |
| commit | 872e509ca5eeaf5e2ec61aea6a5ca393d47c3a65 (patch) | |
| tree | a6e989e5a3047df65399b46d03fccce15757b99e | |
| parent | 2525ec4e52cf12f7d8426f01cc5491ea3c5ee162 (diff) | |
| parent | c04b49ef07defdecadcf614d9ff4cde4b3dd029b (diff) | |
| download | python-openstackclient-872e509ca5eeaf5e2ec61aea6a5ca393d47c3a65.tar.gz | |
Merge "Tweaks to the catalog doc and show command"
| -rw-r--r-- | doc/source/command-objects/catalog.rst | 6 | ||||
| -rw-r--r-- | openstackclient/identity/v2_0/catalog.py | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/doc/source/command-objects/catalog.rst b/doc/source/command-objects/catalog.rst index 4e67f3a4..89db95d5 100644 --- a/doc/source/command-objects/catalog.rst +++ b/doc/source/command-objects/catalog.rst @@ -9,6 +9,7 @@ catalog list List services in the service catalog +.. program:: catalog list .. code:: bash os catalog list @@ -18,7 +19,12 @@ catalog show Display service catalog details +.. program:: catalog show .. code:: bash os catalog show <service> + +.. describe:: <service> + + Service to display (type or name) diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py index 0558c075..f6048378 100644 --- a/openstackclient/identity/v2_0/catalog.py +++ b/openstackclient/identity/v2_0/catalog.py @@ -68,7 +68,7 @@ class ShowCatalog(show.ShowOne): parser.add_argument( 'service', metavar='<service>', - help=_('Service to display (type, name or ID)'), + help=_('Service to display (type or name)'), ) return parser @@ -91,4 +91,9 @@ class ShowCatalog(show.ShowOne): data.pop('endpoints_links') break + if not data: + self.app.log.error('service %s not found\n' % + parsed_args.service) + return ([], []) + return zip(*sorted(six.iteritems(data))) |