openstack/python-designateclient
Code Issues Proposed changes

Correctly support multiple regions

Browse Source 
Change-Id: I1ad90a68d8652686e3aaee04e1e0e775e5b9152d
This commit is contained in:
Kiall Mac Innes 2014-02-18 12:48:16 +00:00
parent cdbcbfc4f5
commit a8d2752433
2 changed files with 12 additions and 6 deletions
designateclient
auth.py
v1
__init__.py

16
designateclient/auth.py

@ -23,7 +23,7 @@ from keystoneclient.v2_0.client import Client
class KeystoneAuth(AuthBase):
def __init__(self, auth_url, username=None, password=None, tenant_id=None,
tenant_name=None, token=None, service_type=None,
endpoint_type=None, sudo_tenant_id=None):
endpoint_type=None, region_name=None, sudo_tenant_id=None):
self.auth_url = str(auth_url).rstrip('/')
self.username = username
self.password = password
@ -40,6 +40,7 @@ class KeystoneAuth(AuthBase):
self.service_type = service_type
self.endpoint_type = endpoint_type
self.region_name = region_name
self.refresh_auth()
@ -64,15 +65,20 @@ class KeystoneAuth(AuthBase):
auth_url=self.auth_url,
insecure=insecure)
def get_endpoints(self, service_type=None, endpoint_type=None):
def get_endpoints(self, service_type=None, endpoint_type=None,
region_name=None):
return self.service_catalog.get_endpoints(
service_type=service_type,
endpoint_type=endpoint_type)
endpoint_type=endpoint_type,
region_name=region_name)
def get_url(self, service_type=None, endpoint_type=None):
def get_url(self, service_type=None, endpoint_type=None, region_name=None):
service_type = service_type or self.service_type
endpoint_type = endpoint_type or self.endpoint_type
endpoints = self.get_endpoints(service_type, endpoint_type)
region_name = region_name or self.region_name
endpoints = self.get_endpoints(service_type, endpoint_type,
region_name)
return endpoints[service_type][0][endpoint_type].rstrip('/')

2
designateclient/v1/__init__.py

@ -43,7 +43,7 @@ class Client(object):
if auth_url:
auth = KeystoneAuth(auth_url, username, password, tenant_id,
tenant_name, token, service_type,
endpoint_type, sudo_tenant_id)
endpoint_type, region_name, sudo_tenant_id)
if endpoint:
self.endpoint = endpoint
else: