Merge "Deprecate adapter"

keystoneclient/adapter.py

@@ -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

keystoneclient/httpclient.py

@@ -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
@@ -52,7 +53,6 @@ except (ImportError, pkg_resources.DistributionNotFound):
 
 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