openstack
/
deb-sahara
Code Issues Proposed changes

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:
Vitaly Gridnev 2016-04-21 08:48:00 +03:00
parent 14b576def2
commit beba6e7528
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/honor-endpoint-type-neutron-4583128c383d9745.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Fixed issue with handling endpoint_type during creation neutron
client, closed bug 1564805

12
sahara/utils/openstack/neutron.py
View File

@ -47,9 +47,11 @@ CONF.register_opts(opts, group=neutron_group)
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)
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,
region_name=CONF.os_region_name)
return neutron
@ -60,11 +62,9 @@ class NeutronClient(object):
routers = {}
def __init__(self, network, token, tenant_name, auth=None):
session = sessions.cache().get_session(sessions.SESSION_TYPE_NEUTRON)
if auth is None:
if not auth:
auth = keystone.token_auth(token=token, project_name=tenant_name)
self.neutron = neutron_cli.Client('2.0', session=session, auth=auth,
region_name=CONF.os_region_name)
self.neutron = client(auth)
self.network = network
def get_router(self):