openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "Deprecate ceilometerclient"

Browse Source
This commit is contained in:
Jenkins
2017-06-09 17:39:30 +00:00
committed by Gerrit Code Review
parent 54e8544bc2 bb017e5f8f
commit 3b4e35abad
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ceilometerclient/shell.py
View File

@@ -19,6 +19,7 @@ from __future__ import print_function
import argparse import argparse
import logging import logging
import sys import sys
import warnings
from oslo_utils import encodeutils from oslo_utils import encodeutils
from oslo_utils import importutils from oslo_utils import importutils
@@ -172,6 +173,10 @@ class CeilometerShell(object):
return api_version, subcommand_parser.parse_args(argv) return api_version, subcommand_parser.parse_args(argv)
def main(self, 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) parsed = self.parse_args(argv)
if parsed == 0: if parsed == 0:
return 0 return 0

4
ceilometerclient/tests/functional/test_readonly_ceilometer.py
View File

@@ -63,9 +63,5 @@ class SimpleReadOnlyCeilometerClientTest(base.ClientTestBase):
# Optional arguments # 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): def test_ceilometer_debug_list(self):
self.ceilometer('meter-list', flags='--debug') self.ceilometer('meter-list', flags='--debug')

6
releasenotes/notes/deprecation-44ae455f4ef3a81e.yaml Normal file
View File

@@ -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.