x/stacklight-integration-tests
Code Issues Proposed changes

Change initialization of ceilometer

Browse Source 
Change-Id: Ifac001b5f0900da80a7e6c6866e16cc1e816ee2c
This commit is contained in:
Artem 2016-07-22 11:17:47 +03:00
parent c5edd887a9
commit d893710c95
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stacklight_tests/ceilometer_redis/api.py
View File

@ -27,16 +27,16 @@ class CeilometerRedisPluginApi(base_test.PluginApi):
@property
def ceilometer(self):
if self._ceilometer is None:
keystone = self.helpers.os_conn.keystone
try:
endpoint = keystone.service_catalog.url_for(
service_type='metering',
endpoint_type='internalURL')
except helpers.NotFound("Cannot initialize ceilometer client"):
return None
keystone_access = self.helpers.os_conn.keystone_access
endpoint = keystone_access.service_catalog.url_for(
service_type='metering',
service_name='ceilometer',
interface='internal')
if not endpoint:
raise helpers.NotFound("Cannot find ceilometer endpoint")
self._ceilometer = ceilometerclient.v2.Client(
endpoint=endpoint, token=lambda: keystone.auth_token)
endpoint=endpoint, token=lambda: keystone_access.auth_token)
return self._ceilometer
def get_plugin_vip(self):