summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsunyajing <yajing.sun@easystack.cn>2016-05-26 16:52:54 +0800
committersunyajing <yajing.sun@easystack.cn>2016-05-26 19:40:26 +0800
commit9e9e4e6f59f7d6a4e0fd8d96c4586d58a8f0059e (patch)
tree2b2b12f41961c59660e09852bb6d0bb51eef8ae7
parent795656184e2d864c30b8e42d13a12d5021680e8b (diff)
downloadpython-openstackclient-9e9e4e6f59f7d6a4e0fd8d96c4586d58a8f0059e.tar.gz
fix endpoint show help
endpoint show command can also work on service name or type or ID option Change-Id: I43c8df4bc093d4130cf33fd2520736ce9077dc82
-rw-r--r--doc/source/command-objects/endpoint.rst6
-rw-r--r--openstackclient/identity/v2_0/endpoint.py5
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/source/command-objects/endpoint.rst b/doc/source/command-objects/endpoint.rst
index 074f20a0..9872a587 100644
--- a/doc/source/command-objects/endpoint.rst
+++ b/doc/source/command-objects/endpoint.rst
@@ -188,9 +188,9 @@ Display endpoint details
.. code:: bash
os endpoint show
- <endpoint-id>
+ <endpoint>
.. _endpoint_show-endpoint:
-.. describe:: <endpoint-id>
+.. describe:: <endpoint>
- Endpoint ID to display
+ Endpoint to display (endpoint ID, service ID, service name, service type)
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index e92f5412..eabf341d 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -129,8 +129,9 @@ class ShowEndpoint(command.ShowOne):
parser = super(ShowEndpoint, self).get_parser(prog_name)
parser.add_argument(
'endpoint_or_service',
- metavar='<endpoint-id>',
- help=_('Endpoint ID to display'),
+ metavar='<endpoint>',
+ help=_('Endpoint to display (endpoint ID, service ID,'
+ ' service name, service type)'),
)
return parser