From 6288620093df182fe2d12585ae343f76f13c8706 Mon Sep 17 00:00:00 2001 From: rabi Date: Wed, 12 Oct 2016 07:54:14 +0530 Subject: 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 --- heatclient/osc/plugin.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'heatclient/osc') diff --git a/heatclient/osc/plugin.py b/heatclient/osc/plugin.py index b57d2de..ea1b69e 100644 --- a/heatclient/osc/plugin.py +++ b/heatclient/osc/plugin.py @@ -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) -- cgit v1.2.1