Use AUTH_INTERFACE object from keystoneauth

As keystoneclient and other services rely more on keystoneauth we should
assume that keystoneauth is our base auth library, not keystoneclient
and start to default to the objects provided from there. This will make
it easier to remove these objects when the time comes.

Use the AUTH_INTERFACE special object from keystoneauth in most places.
This uses it everywhere that is actually session independant. For
example it is not changed within the keystoneclient auth plugins
themselves as they are directly compatible with keystoneauth.

Change-Id: Ibc1224fca98c852106feb78c624b0b2f22b3a19d

2 files changed, 4 insertions, 4 deletions

diff --git a/keystoneclient/v2_0/tenants.py b/keystoneclient/v2_0/tenants.py
index ff40aca..d375da6 100644
--- a/keystoneclient/v2_0/tenants.py
+++ b/keystoneclient/v2_0/tenants.py
@@ -14,10 +14,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from keystoneauth1 import plugin
 import six
 from six.moves import urllib
 
-from keystoneclient import auth
 from keystoneclient import base
 from keystoneclient import exceptions
 
@@ -124,7 +124,7 @@ class TenantManager(base.ManagerWithFind):
         try:
             tenant_list = self._list('/tenants%s' % query, 'tenants')
         except exceptions.EndpointNotFound:
-            endpoint_filter = {'interface': auth.AUTH_INTERFACE}
+            endpoint_filter = {'interface': plugin.AUTH_INTERFACE}
             tenant_list = self._list('/tenants%s' % query, 'tenants',
                                      endpoint_filter=endpoint_filter)
 
diff --git a/keystoneclient/v2_0/tokens.py b/keystoneclient/v2_0/tokens.py
index 2e18507..b5f9657 100644
--- a/keystoneclient/v2_0/tokens.py
+++ b/keystoneclient/v2_0/tokens.py
@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from keystoneauth1 import plugin
 from positional import positional
 
 from keystoneclient import access
-from keystoneclient import auth
 from keystoneclient import base
 from keystoneclient import exceptions
 from keystoneclient.i18n import _
@@ -65,7 +65,7 @@ class TokenManager(base.Manager):
         try:
             token_ref = self._post(*args, **kwargs)
         except exceptions.EndpointNotFound:
-            kwargs['endpoint_filter'] = {'interface': auth.AUTH_INTERFACE}
+            kwargs['endpoint_filter'] = {'interface': plugin.AUTH_INTERFACE}
             token_ref = self._post(*args, **kwargs)
 
         return token_ref