use the only method to initialize client
using separate methods will produce a confusion and issues, like not using endpoint_type during client creation. Change-Id: I01f911da2eb9e8fb3157a71f68ea4ad79437b70f Closes-bug: 1564805
This commit is contained in:
parent
14b576def2
commit
beba6e7528
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- Fixed issue with handling endpoint_type during creation neutron
|
||||||
|
client, closed bug 1564805
|
@ -47,9 +47,11 @@ CONF.register_opts(opts, group=neutron_group)
|
|||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def client():
|
def client(auth=None):
|
||||||
|
if not auth:
|
||||||
|
auth = keystone.auth()
|
||||||
session = sessions.cache().get_session(sessions.SESSION_TYPE_NEUTRON)
|
session = sessions.cache().get_session(sessions.SESSION_TYPE_NEUTRON)
|
||||||
neutron = neutron_cli.Client('2.0', session=session, auth=keystone.auth(),
|
neutron = neutron_cli.Client('2.0', session=session, auth=auth,
|
||||||
endpoint_type=CONF.neutron.endpoint_type,
|
endpoint_type=CONF.neutron.endpoint_type,
|
||||||
region_name=CONF.os_region_name)
|
region_name=CONF.os_region_name)
|
||||||
return neutron
|
return neutron
|
||||||
@ -60,11 +62,9 @@ class NeutronClient(object):
|
|||||||
routers = {}
|
routers = {}
|
||||||
|
|
||||||
def __init__(self, network, token, tenant_name, auth=None):
|
def __init__(self, network, token, tenant_name, auth=None):
|
||||||
session = sessions.cache().get_session(sessions.SESSION_TYPE_NEUTRON)
|
if not auth:
|
||||||
if auth is None:
|
|
||||||
auth = keystone.token_auth(token=token, project_name=tenant_name)
|
auth = keystone.token_auth(token=token, project_name=tenant_name)
|
||||||
self.neutron = neutron_cli.Client('2.0', session=session, auth=auth,
|
self.neutron = client(auth)
|
||||||
region_name=CONF.os_region_name)
|
|
||||||
self.network = network
|
self.network = network
|
||||||
|
|
||||||
def get_router(self):
|
def get_router(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user