openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "Switch to keystoneauth"

Browse Source
This commit is contained in:
Jenkins
2016-06-23 10:33:57 +00:00
committed by Gerrit Code Review
parent 0a1a8d2580 39ee8fbc08
commit 196d3ba850
5 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ceilometerclient/client.py
View File

@@ -13,12 +13,12 @@
import contextlib import contextlib
import time import time
from keystoneclient import adapter from keystoneauth1 import adapter
from keystoneclient.auth.identity import v2 as v2_auth from keystoneauth1 import discover
from keystoneclient.auth.identity import v3 as v3_auth from keystoneauth1 import exceptions as ka_exc
from keystoneclient import discover from keystoneauth1.identity import v2 as v2_auth
from keystoneclient import exceptions as ks_exc from keystoneauth1.identity import v3 as v3_auth
from keystoneclient import session from keystoneauth1 import session
from oslo_utils import strutils from oslo_utils import strutils
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
@@ -35,10 +35,10 @@ def _discover_auth_versions(session, auth_url):
v2_auth_url = None v2_auth_url = None
v3_auth_url = None v3_auth_url = None
try: try:
ks_discover = discover.Discover(session=session, auth_url=auth_url) ks_discover = discover.Discover(session=session, url=auth_url)
v2_auth_url = ks_discover.url_for('2.0') v2_auth_url = ks_discover.url_for('2.0')
v3_auth_url = ks_discover.url_for('3.0') v3_auth_url = ks_discover.url_for('3.0')
except ks_exc.DiscoveryFailure: except ka_exc.DiscoveryFailure:
raise raise
except exceptions.ClientException: except exceptions.ClientException:
# Identity service may not support discovery. In that case, # Identity service may not support discovery. In that case,

28
ceilometerclient/tests/unit/test_client.py
View File

@@ -12,10 +12,10 @@
import types import types
from keystoneclient.auth.identity import v2 as v2_auth from keystoneauth1 import exceptions as ks_exc
from keystoneclient.auth.identity import v3 as v3_auth from keystoneauth1.identity import v2 as v2_auth
from keystoneclient import exceptions as ks_exc from keystoneauth1.identity import v3 as v3_auth
from keystoneclient import session as ks_session from keystoneauth1 import session as ks_session
import mock import mock
import requests import requests
@@ -258,8 +258,8 @@ class ClientAuthTest(utils.BaseTestCase):
return_value=mock.MagicMock()): return_value=mock.MagicMock()):
return client.get_client(api_version, **env) return client.get_client(api_version, **env)
@mock.patch('keystoneclient.discover.Discover') @mock.patch('keystoneauth1.discover.Discover')
@mock.patch('keystoneclient.session.Session') @mock.patch('keystoneauth1.session.Session')
def test_discover_auth_versions(self, session, discover_mock): def test_discover_auth_versions(self, session, discover_mock):
env = FAKE_ENV.copy() env = FAKE_ENV.copy()
env.pop('auth_plugin', None) env.pop('auth_plugin', None)
@@ -271,13 +271,13 @@ class ClientAuthTest(utils.BaseTestCase):
client.auth_plugin.opts.pop('token', None) client.auth_plugin.opts.pop('token', None)
client.auth_plugin._do_authenticate(mock.MagicMock()) client.auth_plugin._do_authenticate(mock.MagicMock())
self.assertEqual([mock.call(auth_url='http://no.where', self.assertEqual([mock.call(url='http://no.where',
session=mock_session_instance)], session=mock_session_instance)],
discover_mock.call_args_list) discover_mock.call_args_list)
self.assertIsInstance(mock_session_instance.auth, v3_auth.Password) self.assertIsInstance(mock_session_instance.auth, v3_auth.Password)
@mock.patch('keystoneclient.discover.Discover') @mock.patch('keystoneauth1.discover.Discover')
@mock.patch('keystoneclient.session.Session') @mock.patch('keystoneauth1.session.Session')
def test_discover_auth_versions_v2_only(self, session, discover): def test_discover_auth_versions_v2_only(self, session, discover):
env = FAKE_ENV.copy() env = FAKE_ENV.copy()
env.pop('auth_plugin', None) env.pop('auth_plugin', None)
@@ -297,14 +297,14 @@ class ClientAuthTest(utils.BaseTestCase):
client = self.create_client(env) client = self.create_client(env)
client.auth_plugin.opts.pop('token', None) client.auth_plugin.opts.pop('token', None)
client.auth_plugin._do_authenticate(mock.MagicMock()) client.auth_plugin._do_authenticate(mock.MagicMock())
self.assertEqual([mock.call(auth_url='http://no.where', self.assertEqual([mock.call(url='http://no.where',
session=session_instance_mock)], session=session_instance_mock)],
discover.call_args_list) discover.call_args_list)
self.assertIsInstance(session_instance_mock.auth, v2_auth.Password) self.assertIsInstance(session_instance_mock.auth, v2_auth.Password)
@mock.patch('keystoneclient.discover.Discover') @mock.patch('keystoneauth1.discover.Discover')
@mock.patch('keystoneclient.session.Session') @mock.patch('keystoneauth1.session.Session')
def test_discover_auth_versions_raise_discovery_failure(self, def test_discover_auth_versions_raise_discovery_failure(self,
session, session,
discover): discover):
@@ -331,9 +331,9 @@ class ClientAuthTest(utils.BaseTestCase):
self.assertRaises(ks_exc.DiscoveryFailure, self.assertRaises(ks_exc.DiscoveryFailure,
client.auth_plugin._do_authenticate, client.auth_plugin._do_authenticate,
mock.Mock()) mock.Mock())
self.assertEqual([mock.call(auth_url='http://no.where', self.assertEqual([mock.call(url='http://no.where',
session=session_instance_mock), session=session_instance_mock),
mock.call(auth_url='http://no.where', mock.call(url='http://no.where',
session=session_instance_mock)], session=session_instance_mock)],
discover.call_args_list) discover.call_args_list)

2
ceilometerclient/tests/unit/test_shell.py
View File

@@ -14,7 +14,7 @@ import re
import sys import sys
import fixtures import fixtures
from keystoneclient import session as ks_session from keystoneauth1 import session as ks_session
import mock import mock
import six import six
from testtools import matchers from testtools import matchers

2
ceilometerclient/tests/unit/v2/test_shell.py
View File

@@ -35,7 +35,7 @@ from ceilometerclient.v2 import shell as ceilometer_shell
from ceilometerclient.v2 import statistics from ceilometerclient.v2 import statistics
from ceilometerclient.v2 import trait_descriptions from ceilometerclient.v2 import trait_descriptions
from ceilometerclient.v2 import traits from ceilometerclient.v2 import traits
from keystoneclient import exceptions from keystoneauth1 import exceptions
class ShellAlarmStateCommandsTest(utils.BaseTestCase): class ShellAlarmStateCommandsTest(utils.BaseTestCase):

9
ceilometerclient/v2/client.py
View File

@@ -28,14 +28,13 @@ from ceilometerclient.v2 import statistics
from ceilometerclient.v2 import trait_descriptions from ceilometerclient.v2 import trait_descriptions
from ceilometerclient.v2 import traits from ceilometerclient.v2 import traits
from keystoneauth1 import exceptions as ka_exc from keystoneauth1 import exceptions as ka_exc
from keystoneclient import exceptions as kc_exc
class Client(object): class Client(object):
"""Client for the Ceilometer v2 API. """Client for the Ceilometer v2 API.
:param session: a keystoneauth/keystoneclient session object :param session: a keystoneauth session object
:type session: keystoneclient.session.Session :type session: keystoneauth1.session.Session
:param str service_type: The default service_type for URL discovery :param str service_type: The default service_type for URL discovery
:param str service_name: The default service_name for URL discovery :param str service_name: The default service_name for URL discovery
:param str interface: The default interface for URL discovery :param str interface: The default interface for URL discovery
@@ -44,7 +43,7 @@ class Client(object):
:param str endpoint_override: Always use this endpoint URL for requests :param str endpoint_override: Always use this endpoint URL for requests
for this ceiloclient for this ceiloclient
:param auth: An auth plugin to use instead of the session one :param auth: An auth plugin to use instead of the session one
:type auth: keystoneclient.auth.base.BaseAuthPlugin :type auth: keystoneauth1.plugin.BaseAuthPlugin
:param str user_agent: The User-Agent string to set :param str user_agent: The User-Agent string to set
(Default is python-ceilometer-client) (Default is python-ceilometer-client)
:param int connect_retries: the maximum number of retries that should be :param int connect_retries: the maximum number of retries that should be
@@ -122,7 +121,5 @@ class Client(object):
return c return c
except ka_exc.EndpointNotFound: except ka_exc.EndpointNotFound:
return None return None
except kc_exc.EndpointNotFound:
return None
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
return None return None