Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gnocchiclient creation

Browse Source 
Gnocchiclient uses keystoneauth1.adapter so that adapter_options
need to be given.
This patch fixes gnocchiclient creation.

Change-Id: I6b5d8ee775929f4b3fd30be3321b378d19085547
Closes-Bug: #1714871
This commit is contained in:
Hidekazu Nakamura
2017-09-04 14:52:11 +09:00
parent c9a43d8da4
commit a2fa13c8ff
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
watcher/common/clients.py
View File

@@ -110,8 +110,12 @@ class OpenStackClients(object):
'api_version') 'api_version')
gnocchiclient_interface = self._get_client_option('gnocchi', gnocchiclient_interface = self._get_client_option('gnocchi',
'endpoint_type') 'endpoint_type')
adapter_options = {
"interface": gnocchiclient_interface
}
self._gnocchi = gnclient.Client(gnocchiclient_version, self._gnocchi = gnclient.Client(gnocchiclient_version,
interface=gnocchiclient_interface, adapter_options=adapter_options,
session=self.session) session=self.session)
return self._gnocchi return self._gnocchi

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

@@ -190,7 +190,8 @@ class TestClients(base.TestCase):
osc.gnocchi() osc.gnocchi()
mock_call.assert_called_once_with( mock_call.assert_called_once_with(
CONF.gnocchi_client.api_version, CONF.gnocchi_client.api_version,
interface=CONF.gnocchi_client.endpoint_type, adapter_options={
"interface": CONF.gnocchi_client.endpoint_type},
session=mock_session) session=mock_session)
@mock.patch.object(clients.OpenStackClients, 'session') @mock.patch.object(clients.OpenStackClients, 'session')