From a2fa13c8ff71a11d9b13bb06e932754cc2a5e4ef Mon Sep 17 00:00:00 2001
From: Hidekazu Nakamura <hid-nakamura@vf.jp.nec.com>
Date: Mon, 4 Sep 2017 14:52:11 +0900
Subject: [PATCH] Fix gnocchiclient creation

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

Change-Id: I6b5d8ee775929f4b3fd30be3321b378d19085547
Closes-Bug: #1714871
---
 watcher/common/clients.py            | 6 +++++-
 watcher/tests/common/test_clients.py | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/watcher/common/clients.py b/watcher/common/clients.py
index 6ad35ea36..047840004 100755
--- a/watcher/common/clients.py
+++ b/watcher/common/clients.py
@@ -110,8 +110,12 @@ class OpenStackClients(object):
                                                         'api_version')
         gnocchiclient_interface = self._get_client_option('gnocchi',
                                                           'endpoint_type')
+        adapter_options = {
+            "interface": gnocchiclient_interface
+        }
+
         self._gnocchi = gnclient.Client(gnocchiclient_version,
-                                        interface=gnocchiclient_interface,
+                                        adapter_options=adapter_options,
                                         session=self.session)
         return self._gnocchi
 
diff --git a/watcher/tests/common/test_clients.py b/watcher/tests/common/test_clients.py
index fc4b5864f..3511d813a 100755
--- a/watcher/tests/common/test_clients.py
+++ b/watcher/tests/common/test_clients.py
@@ -190,7 +190,8 @@ class TestClients(base.TestCase):
         osc.gnocchi()
         mock_call.assert_called_once_with(
             CONF.gnocchi_client.api_version,
-            interface=CONF.gnocchi_client.endpoint_type,
+            adapter_options={
+                "interface": CONF.gnocchi_client.endpoint_type},
             session=mock_session)
 
     @mock.patch.object(clients.OpenStackClients, 'session')