python-ceilometerclient-2.8.1+ compatibility patch

Change-Id: I286137d41573b2b28af63cd34dd67768df1df686
This commit is contained in:
Martin Mágr 2017-08-16 15:40:19 +02:00
parent 4076dce887
commit e17960ddba
2 changed files with 5 additions and 9 deletions

View File

@ -22,7 +22,7 @@ import json
import re
from oschecks import utils
from ceilometerclient.openstack.common.apiclient import exceptions
from ceilometerclient import exc
def _check_ceilometer_api():
@ -36,12 +36,13 @@ def _check_ceilometer_api():
def meters_list():
try:
return client.meters.list()
except exceptions.Gone as ex:
msg = json.loads(ex.response.content)
utils.warning(re.sub(r'\s\s*', ' ', msg['error_message']))
except exc.HTTPNotFound as ex:
utils.warning('Did not find Ceilometer API running '
'on given endpoint')
except Exception as ex:
utils.critical(str(ex))
elapsed, meters = utils.timeit(meters_list)
if not meters:
utils.critical("Unable to contact Ceilometer API.")

View File

@ -181,11 +181,6 @@ class Ceilometer(object):
from ceilometerclient import shell
self.ceilometer = shell.CeilometerShell()
self.base_argv = copy.deepcopy(sys.argv[1:])
# NOTE(gordc): workaround for bug1434264
if not hasattr(self.ceilometer, 'auth_plugin'):
from ceilometerclient import client
if hasattr(client, 'AuthPlugin'):
self.ceilometer.auth_plugin = client.AuthPlugin()
self.ceilometer.parser = self.ceilometer.get_base_parser()
self.add_argument = self.ceilometer.parser.add_argument