Merge "Deprecate ceilometerclient"2.9.0

2 files changed, 5 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')