Merge "Show deprecation warning and limit features for KSC session"
This commit is contained in:
commit
946278d98c
|
@ -11,9 +11,12 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
import warnings
|
||||||
|
|
||||||
from positional import positional
|
from positional import positional
|
||||||
|
|
||||||
|
from keystoneauth1 import session
|
||||||
|
|
||||||
|
|
||||||
class Adapter(object):
|
class Adapter(object):
|
||||||
"""An instance of a session with local variables.
|
"""An instance of a session with local variables.
|
||||||
|
@ -119,10 +122,18 @@ class Adapter(object):
|
||||||
kwargs.setdefault('logger', self.logger)
|
kwargs.setdefault('logger', self.logger)
|
||||||
if self.allow:
|
if self.allow:
|
||||||
kwargs.setdefault('allow', self.allow)
|
kwargs.setdefault('allow', self.allow)
|
||||||
if self.client_name:
|
|
||||||
kwargs.setdefault('client_name', self.client_name)
|
if isinstance(self.session, session.Session):
|
||||||
if self.client_version:
|
# these things are unsupported by keystoneclient's session so be
|
||||||
kwargs.setdefault('client_version', self.client_version)
|
# 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():
|
for k, v in self.additional_headers.items():
|
||||||
kwargs.setdefault('headers', {}).setdefault(k, v)
|
kwargs.setdefault('headers', {}).setdefault(k, v)
|
||||||
|
|
Loading…
Reference in New Issue