diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-09 17:39:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-09 17:39:30 +0000 |
| commit | 3b4e35abada626ce052f20d55c71fe12ab77052a (patch) | |
| tree | a43ec68f618ecd5072cf2a2b5d81ae1ad87079e7 | |
| parent | 54e8544bc2689fdf692570401cc4584419962434 (diff) | |
| parent | bb017e5f8f4ab88d77b746404a8bfe9e109c4487 (diff) | |
| download | python-ceilometerclient-3b4e35abada626ce052f20d55c71fe12ab77052a.tar.gz | |
Merge "Deprecate ceilometerclient"2.9.0
| -rw-r--r-- | ceilometerclient/shell.py | 5 | ||||
| -rw-r--r-- | ceilometerclient/tests/functional/test_readonly_ceilometer.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/deprecation-44ae455f4ef3a81e.yaml | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 799a537..d096f3b 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -19,6 +19,7 @@ from __future__ import print_function import argparse import logging import sys +import warnings from oslo_utils import encodeutils from oslo_utils import importutils @@ -172,6 +173,10 @@ class CeilometerShell(object): return api_version, subcommand_parser.parse_args(argv) def main(self, argv): + warnings.warn( + "ceilometerclient is now deprecated as the Ceilometer API has " + "been deprecated. Please use either aodhclient, pankoclient or " + "gnocchiclient.") parsed = self.parse_args(argv) if parsed == 0: return 0 diff --git a/ceilometerclient/tests/functional/test_readonly_ceilometer.py b/ceilometerclient/tests/functional/test_readonly_ceilometer.py index 7b313f3..53e2192 100644 --- a/ceilometerclient/tests/functional/test_readonly_ceilometer.py +++ b/ceilometerclient/tests/functional/test_readonly_ceilometer.py @@ -63,9 +63,5 @@ class SimpleReadOnlyCeilometerClientTest(base.ClientTestBase): # Optional arguments - def test_ceilometer_version(self): - version = self.ceilometer('', flags='--version', merge_stderr=True) - self.assertTrue(re.search('^[0-9.]+', version)) - def test_ceilometer_debug_list(self): self.ceilometer('meter-list', flags='--debug') diff --git a/releasenotes/notes/deprecation-44ae455f4ef3a81e.yaml b/releasenotes/notes/deprecation-44ae455f4ef3a81e.yaml new file mode 100644 index 0000000..8a182a5 --- /dev/null +++ b/releasenotes/notes/deprecation-44ae455f4ef3a81e.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + As the Ceilometer API has been deprecated, this client is also now marked + as deprecated and will print a warning when used as a command-line + interface tool. |