Ignore aodh_endpoint argument

When using keystone session, we seem to pass all **kwargs to
SessionClient for metering. We should drop the 'aodh_endpoint'
from kwargs.

Change-Id: Iaf28d4a525d49f62a0ae635dc1102cc1f0308c74
Closes-Bug: #1589425

2 files changed, 20 insertions, 1 deletions

diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py
index 451c7c0..35bf204 100644
--- a/ceilometerclient/client.py
+++ b/ceilometerclient/client.py
@@ -402,6 +402,8 @@ def _construct_http_client(**kwargs):
         # Drop legacy options
         for opt in LEGACY_OPTS:
             kwargs.pop(opt, None)
+        # Drop aodh_endpoint from kwargs
+        kwargs.pop('aodh_endpoint', None)
 
         return SessionClient(
             session=kwargs.pop('session'),
diff --git a/ceilometerclient/tests/unit/test_client.py b/ceilometerclient/tests/unit/test_client.py
index 5233709..9eb7f17 100644
--- a/ceilometerclient/tests/unit/test_client.py
+++ b/ceilometerclient/tests/unit/test_client.py
@@ -228,6 +228,24 @@ class ClientTestWithAodh(ClientTest):
             ceiloclient = client.get_client(2, **env)
             self.assertIsInstance(ceiloclient, v2client.Client)
 
+    @mock.patch('ceilometerclient.client.SessionClient')
+    def test_http_client_with_session_and_aodh(self, mock_sc):
+        session = mock.Mock()
+        kwargs = {"session": session,
+                  "service_type": "metering",
+                  "user_agent": "python-ceilometerclient"}
+        expected = {
+            "auth": None,
+            "interface": 'publicURL',
+            "region_name": None,
+            "timings": None,
+            "session": session,
+            "service_type": "metering",
+            "user_agent": "python-ceilometerclient"}
+        kwargs['aodh_endpoint'] = 'http://aodh.where'
+        client._construct_http_client(**kwargs)
+        mock_sc.assert_called_with(**expected)
+
 
 class ClientAuthTest(utils.BaseTestCase):
 
@@ -351,7 +369,6 @@ class ClientAuthTest(utils.BaseTestCase):
         session = mock.Mock()
         session.request.return_value = mock.Mock(status_code=404,
                                                  text=b'')
-
         env = {"session": session,
                "service_type": "metering",
                "user_agent": "python-ceilometerclient"}