Deprecate adapter
This involves switching keystoneclient to use the adapter on keystoneauth. Change-Id: I02780b0c00e3865f083b4bca98bff81127ed2277 Implements: bp deprecate-to-ksa
This commit is contained in:
parent
03e209fd6f
commit
2d7fa423ff
|
@ -10,6 +10,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import warnings
|
||||
|
||||
from oslo_serialization import jsonutils
|
||||
from positional import positional
|
||||
|
||||
|
@ -49,6 +51,11 @@ class Adapter(object):
|
|||
interface=None, region_name=None, endpoint_override=None,
|
||||
version=None, auth=None, user_agent=None,
|
||||
connect_retries=None, logger=None):
|
||||
warnings.warn(
|
||||
'keystoneclient.adapter.Adapter is deprecated as of the 2.1.0 '
|
||||
'release in favor of keystoneauth1.adapter.Adapter. It will be '
|
||||
'removed in future releases.', DeprecationWarning)
|
||||
|
||||
# NOTE(jamielennox): when adding new parameters to adapter please also
|
||||
# add them to the adapter call in httpclient.HTTPClient.__init__
|
||||
self.session = session
|
||||
|
|
|
@ -24,6 +24,7 @@ import warnings
|
|||
|
||||
from debtcollector import removals
|
||||
from debtcollector import renames
|
||||
from keystoneauth1 import adapter
|
||||
from oslo_serialization import jsonutils
|
||||
import pkg_resources
|
||||
from positional import positional
|
||||
|
@ -57,7 +58,6 @@ if not hasattr(urlparse, 'parse_qsl'):
|
|||
|
||||
from keystoneclient import _discover
|
||||
from keystoneclient import access
|
||||
from keystoneclient import adapter
|
||||
from keystoneclient.auth import base
|
||||
from keystoneclient import baseclient
|
||||
from keystoneclient import exceptions
|
||||
|
|
Loading…
Reference in New Issue