openstack/python-magnumclient
Code Issues Proposed changes

Merge "Delegate magnum url search to url_for method"

Browse Source
This commit is contained in:
Jenkins
2015-04-19 00:14:07 +00:00
committed by Gerrit Code Review
parent ac6bafa236 1b14206ac9
commit 700ffe8f6b
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
magnumclient/tests/v1/test_client.py
View File

@@ -20,8 +20,6 @@ from magnumclient.v1 import client
class ClientTest(testtools.TestCase):
ENDPOINTS = {'container': [{'publicURL': 'http://myurl/'}]}
@mock.patch('magnumclient.common.httpclient.HTTPClient')
@mock.patch.object(client.Client, 'get_keystone_client')
def test_init_with_token_and_url(self, keystone_client, http_client):
@@ -34,7 +32,7 @@ class ClientTest(testtools.TestCase):
@mock.patch.object(client.Client, 'get_keystone_client')
def test_init_with_token(self, keystone_client, http_client):
mocked = mock.Mock()
mocked.service_catalog.get_endpoints.return_value = self.ENDPOINTS
mocked.service_catalog.url_for.return_value = 'http://myurl/'
keystone_client.return_value = mocked
client.Client(input_auth_token='mytoken', auth_url='authurl')
@@ -50,7 +48,7 @@ class ClientTest(testtools.TestCase):
def test_init_with_user(self, keystone_client, http_client):
mocked = mock.Mock()
mocked.auth_token = 'mytoken'
mocked.service_catalog.get_endpoints.return_value = self.ENDPOINTS
mocked.service_catalog.url_for.return_value = 'http://myurl/'
keystone_client.return_value = mocked
client.Client(username='user', api_key='pass', project_name='prj',

17
magnumclient/v1/client.py
View File

@@ -43,7 +43,6 @@ class Client(object):
if not input_auth_token:
raise RuntimeError("Not Authorized")
magnum_catalog_url = magnum_url
if not magnum_url:
keystone = keystone or self.get_keystone_client(
username=username,
@@ -52,15 +51,10 @@ class Client(object):
token=input_auth_token,
project_id=project_id,
project_name=project_name)
catalog = keystone.service_catalog.get_endpoints(
service_type, region_name=region_name)
if service_type in catalog:
for e_type, endpoint in catalog.get(service_type)[0].items():
if str(e_type).lower() == str(endpoint_type).lower():
magnum_catalog_url = endpoint
break
if not magnum_catalog_url:
raise RuntimeError("Could not find Magnum endpoint in catalog")
magnum_url = keystone.service_catalog.url_for(
service_type=service_type,
endpoint_type=endpoint_type,
region_name=region_name)
http_cli_kwargs = {
'token': input_auth_token,
@@ -76,8 +70,7 @@ class Client(object):
# 'key_file': kwargs.get('key_file'),
'auth_ref': None,
}
self.http_client = httpclient.HTTPClient(magnum_catalog_url,
**http_cli_kwargs)
self.http_client = httpclient.HTTPClient(magnum_url, **http_cli_kwargs)
self.bays = bays.BayManager(self.http_client)
self.baymodels = baymodels.BayModelManager(self.http_client)
self.containers = containers.ContainerManager(self.http_client)