openstack/watcher
Code Issues Proposed changes

Merge "Ceilometer client instantiation fixup"

Browse Source
This commit is contained in:
Jenkins
2016-02-12 10:00:33 +00:00
committed by Gerrit Code Review
parent a0b5f5aa1d b958214db8
commit 58d84aca6d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/common/clients.py
View File

@@ -141,8 +141,8 @@ class OpenStackClients(object):
ceilometerclient_version = self._get_client_option('ceilometer',
'api_version')
self._ceilometer = ceclient.Client(ceilometerclient_version,
session=self.session)
self._ceilometer = ceclient.get_client(ceilometerclient_version,
session=self.session)
return self._ceilometer
@exception.wrap_keystone_exception

3
watcher/tests/common/test_clients.py
View File

@@ -187,6 +187,7 @@ class TestClients(base.BaseTestCase):
osc.ceilometer()
mock_call.assert_called_once_with(
cfg.CONF.ceilometer_client.api_version,
None,
session=mock_session)
@mock.patch.object(clients.OpenStackClients, 'session')
@@ -194,6 +195,7 @@ class TestClients(base.BaseTestCase):
def test_clients_ceilometer_diff_vers(self, mock_get_alarm_client,
mock_session):
'''ceilometerclient currently only has one version (v2)'''
mock_get_alarm_client.return_value = [mock.Mock(), mock.Mock()]
cfg.CONF.set_override('api_version', '2',
group='ceilometer_client')
osc = clients.OpenStackClients()
@@ -206,6 +208,7 @@ class TestClients(base.BaseTestCase):
@mock.patch.object(ceclient_v2.Client, '_get_alarm_client')
def test_clients_ceilometer_cached(self, mock_get_alarm_client,
mock_session):
mock_get_alarm_client.return_value = [mock.Mock(), mock.Mock()]
osc = clients.OpenStackClients()
osc._ceilometer = None
ceilometer = osc.ceilometer()