openstack
/
python-heatclient
Code Issues Proposed changes

Use region_name and interface with session 

Use region_name and interface  with session. Also use
public attributes of ClientManager for them.

Change-Id: Id836f503ff4d5189f90c4eaf68769bfbaa9dbd2f
This commit is contained in:
rabi 2016-10-12 07:54:14 +05:30
parent 0d218c92be
commit 6288620093
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
heatclient/osc/plugin.py
View File

@ -33,24 +33,23 @@ def make_client(instance):
API_VERSIONS)
LOG.debug('Instantiating orchestration client: %s', heat_client)
kwargs = {'region_name': instance.region_name,
'interface': instance.interface}
if instance.session:
kwargs = {'session': instance.session,
'service_type': API_NAME}
kwargs.update({'session': instance.session,
'service_type': API_NAME})
else:
# Note: We can change '_interface' and '_region_name' once
# the requirements change to python-openstackclient-2.6.1
endpoint = instance.get_endpoint_for_service_type(
API_NAME,
region_name=instance._region_name,
interface=instance._interface,
region_name=instance.region_name,
interface=instance.interface,
)
kwargs = {'endpoint': endpoint,
'auth_url': instance.auth.auth_url,
'region_name': instance._region_name,
'username': instance.auth_ref.username}
kwargs.update(token=instance.auth_ref.auth_token)
kwargs.update({'endpoint': endpoint,
'auth_url': instance.auth.auth_url,
'username': instance.auth_ref.username,
'token': instance.auth_ref.auth_token})
client = heat_client(**kwargs)