"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "heat/engine/clients/client_plugin.py" between
openstack-heat-12.0.0.tar.gz and openstack-heat-13.0.0.tar.gz

About: OpenStack Heat (Optional Service: Orchestration) orchestrates multiple composite cloud applications by using either the native HOT template format or the AWS CloudFormation template format, through both an OpenStack-native REST API and a CloudFormation-compatible Query API.
The "Train" series (latest release).

client_plugin.py  (openstack-heat-12.0.0):client_plugin.py  (openstack-heat-13.0.0)
skipping to change at line 27 skipping to change at line 27
from keystoneauth1 import exceptions from keystoneauth1 import exceptions
from keystoneauth1.identity import generic from keystoneauth1.identity import generic
from keystoneauth1 import plugin from keystoneauth1 import plugin
from oslo_config import cfg from oslo_config import cfg
from oslo_utils import excutils from oslo_utils import excutils
import requests import requests
import six import six
from heat.common import config from heat.common import config
from heat.common import context
from heat.common import exception as heat_exception from heat.common import exception as heat_exception
cfg.CONF.import_opt('client_retry_limit', 'heat.common.config') cfg.CONF.import_opt('client_retry_limit', 'heat.common.config')
@six.add_metaclass(abc.ABCMeta) @six.add_metaclass(abc.ABCMeta)
class ClientPlugin(object): class ClientPlugin(object):
# Module which contains all exceptions classes which the client # Module which contains all exceptions classes which the client
# may emit # may emit
exceptions_module = None exceptions_module = None
skipping to change at line 95 skipping to change at line 96
def _create(self, version=None): def _create(self, version=None):
"""Return a newly created client.""" """Return a newly created client."""
pass pass
def _get_region_name(self): def _get_region_name(self):
return self.context.region_name or cfg.CONF.region_name_for_services return self.context.region_name or cfg.CONF.region_name_for_services
def url_for(self, **kwargs): def url_for(self, **kwargs):
keystone_session = self.context.keystone_session keystone_session = self.context.keystone_session
@context.retry_on_connection_timeout
def get_endpoint(): def get_endpoint():
return keystone_session.get_endpoint(**kwargs) return keystone_session.get_endpoint(**kwargs)
# NOTE(jamielennox): use the session defined by the keystoneclient # NOTE(jamielennox): use the session defined by the keystoneclient
# options as traditionally the token was always retrieved from # options as traditionally the token was always retrieved from
# keystoneclient. # keystoneclient.
try: try:
kwargs.setdefault('interface', kwargs.pop('endpoint_type')) kwargs.setdefault('interface', kwargs.pop('endpoint_type'))
except KeyError: except KeyError:
pass pass
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)