openstack
/
keystoneauth
Code Issues Proposed changes

Merge "Show deprecation warning and limit features for KSC session"

This commit is contained in:
Jenkins 2016-10-20 04:01:43 +00:00 committed by Gerrit Code Review
parent 57f8d2cde5 6c71469783
commit 946278d98c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
keystoneauth1/adapter.py
View File

@ -11,9 +11,12 @@
# under the License.
import os
import warnings
from positional import positional
from keystoneauth1 import session
class Adapter(object):
"""An instance of a session with local variables.
@ -119,10 +122,18 @@ class Adapter(object):
kwargs.setdefault('logger', self.logger)
if self.allow:
kwargs.setdefault('allow', self.allow)
if self.client_name:
kwargs.setdefault('client_name', self.client_name)
if self.client_version:
kwargs.setdefault('client_version', self.client_version)
if isinstance(self.session, session.Session):
# these things are unsupported by keystoneclient's session so be
# careful with them until everyone has transitioned to ksa.
if self.client_name:
kwargs.setdefault('client_name', self.client_name)
if self.client_version:
kwargs.setdefault('client_version', self.client_version)
else:
warnings.warn('Using keystoneclient sessions has been deprecated. '
'Please update your software to use keystoneauth1.')
for k, v in self.additional_headers.items():
kwargs.setdefault('headers', {}).setdefault(k, v)