summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-19 08:55:37 +0000
committerGerrit Code Review <review@openstack.org>2016-08-19 08:55:37 +0000
commitf802d1ae1add84a3cd590de596d7835c1fce79b3 (patch)
tree7eeac1cc4c42110dc03f4890899b1ce7ed0b1776
parentb76f5944130e29ee1bf3095c966a393c489c05e6 (diff)
parent7a566e69151ba30831a47966450f81ae085c91ff (diff)
downloadpython-cinderclient-f802d1ae1add84a3cd590de596d7835c1fce79b3.tar.gz
Merge "deprecate command `cinder endpoints`"
-rw-r--r--cinderclient/v1/shell.py5
-rw-r--r--cinderclient/v3/shell.py5
-rw-r--r--releasenotes/notes/bug-1608166-ad91a7a9f50e658a.yaml7
3 files changed, 17 insertions, 0 deletions
diff --git a/cinderclient/v1/shell.py b/cinderclient/v1/shell.py
index 2c06e67..3776fa1 100644
--- a/cinderclient/v1/shell.py
+++ b/cinderclient/v1/shell.py
@@ -23,6 +23,7 @@ import copy
import os
import sys
import time
+import warnings
from cinderclient import exceptions
from cinderclient import utils
@@ -654,6 +655,10 @@ def do_type_key(cs, args):
def do_endpoints(cs, args):
"""Discovers endpoints registered by authentication service."""
+ warnings.warn(
+ "``cinder endpoints`` is deprecated, use ``openstack catalog list`` "
+ "instead. The ``cinder endpoints`` command may be removed in the P "
+ "release or next major release of cinderclient (v2.0.0 or greater).")
catalog = cs.client.service_catalog.catalog
for e in catalog:
utils.print_dict(e['endpoints'][0], e['name'])
diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py
index 145fdf4..e5a5ea1 100644
--- a/cinderclient/v3/shell.py
+++ b/cinderclient/v3/shell.py
@@ -21,6 +21,7 @@ import copy
import os
import sys
import time
+import warnings
import six
@@ -1034,6 +1035,10 @@ def do_type_access_remove(cs, args):
@utils.service_type('volumev3')
def do_endpoints(cs, args):
"""Discovers endpoints registered by authentication service."""
+ warnings.warn(
+ "``cinder endpoints`` is deprecated, use ``openstack catalog list`` "
+ "instead. The ``cinder endpoints`` command may be removed in the P "
+ "release or next major release of cinderclient (v2.0.0 or greater).")
catalog = cs.client.service_catalog.catalog
for e in catalog:
utils.print_dict(e['endpoints'][0], e['name'])
diff --git a/releasenotes/notes/bug-1608166-ad91a7a9f50e658a.yaml b/releasenotes/notes/bug-1608166-ad91a7a9f50e658a.yaml
new file mode 100644
index 0000000..6f92b74
--- /dev/null
+++ b/releasenotes/notes/bug-1608166-ad91a7a9f50e658a.yaml
@@ -0,0 +1,7 @@
+---
+deprecations:
+ - |
+ The ``cinder endpoints`` command has been deprecated. This
+ command performs an identity operation, and should now be
+ handled by ``openstack catalog list``.
+ [Bug `1608166 <https://bugs.launchpad.net/bugs/1608166>`_]