From bb017e5f8f4ab88d77b746404a8bfe9e109c4487 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Tue, 16 May 2017 11:49:26 +0200
Subject: [PATCH] Deprecate ceilometerclient

Change-Id: I9259b2e44ac1ba815a6eec5019f0460065996eac
---
 ceilometerclient/shell.py                                   | 5 +++++
 .../tests/functional/test_readonly_ceilometer.py            | 4 ----
 releasenotes/notes/deprecation-44ae455f4ef3a81e.yaml        | 6 ++++++
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/deprecation-44ae455f4ef3a81e.yaml

diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py
index 799a5376..d096f3bd 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 7b313f3c..53e21920 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 00000000..8a182a57
--- /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.