Use fixtures 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.

The easiest thing to move is the keystoneclient fixtures in favor of the
keystoneauth fixtures.

Change-Id: I5a784795536cec6c7ca5eead3f13b1e7a6e45346

keystoneclient/tests/unit/auth/test_access.py

@@ -12,10 +12,11 @@
 
 import uuid
 
+from keystoneauth1 import fixture
+
 from keystoneclient import access
 from keystoneclient import auth
 from keystoneclient.auth.identity import access as access_plugin
-from keystoneclient import fixture
 from keystoneclient import session
 from keystoneclient.tests.unit import utils
 

keystoneclient/tests/unit/auth/test_identity_common.py

@@ -14,6 +14,7 @@ import abc
 import datetime
 import uuid
 
+from keystoneauth1 import fixture
 import mock
 from oslo_utils import timeutils
 import six
@@ -22,7 +23,6 @@ from keystoneclient import access
 from keystoneclient.auth import base
 from keystoneclient.auth import identity
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient import session
 from keystoneclient.tests.unit import utils
 

keystoneclient/tests/unit/auth/test_identity_v3.py

@@ -14,6 +14,7 @@ import argparse
 import copy
 import uuid
 
+from keystoneauth1 import fixture
 import mock
 
 from keystoneclient import access
@@ -21,7 +22,6 @@ from keystoneclient.auth.identity import v3
 from keystoneclient.auth.identity.v3 import base as v3_base
 from keystoneclient import client
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient import session
 from keystoneclient.tests.unit import utils
 

keystoneclient/tests/unit/auth/test_identity_v3_federated.py

@@ -13,9 +13,10 @@
 import copy
 import uuid
 
+from keystoneauth1 import fixture
+
 from keystoneclient import access
 from keystoneclient.auth.identity import v3
-from keystoneclient import fixture
 from keystoneclient import session
 from keystoneclient.tests.unit import utils
 

keystoneclient/tests/unit/auth/utils.py

@@ -13,6 +13,7 @@
 import functools
 import uuid
 
+from keystoneauth1 import fixture
 import mock
 from oslo_config import cfg
 import six
@@ -20,7 +21,6 @@ import six
 from keystoneclient import access
 from keystoneclient.auth import base
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient import session
 from keystoneclient.tests.unit import utils
 

keystoneclient/tests/unit/client_fixtures.py

@@ -18,6 +18,7 @@ import uuid
 import warnings
 
 import fixtures
+from keystoneauth1 import fixture
 from keystoneauth1 import identity as ksa_identity
 from keystoneauth1 import session as ksa_session
 from oslo_serialization import jsonutils
@@ -27,7 +28,6 @@ import testresources
 
 from keystoneclient.auth import identity as ksc_identity
 from keystoneclient.common import cms
-from keystoneclient import fixture
 from keystoneclient import session as ksc_session
 from keystoneclient import utils
 from keystoneclient.v2_0 import client as v2_client

keystoneclient/tests/unit/test_discovery.py

@@ -13,6 +13,7 @@
 import re
 import uuid
 
+from keystoneauth1 import fixture
 from oslo_serialization import jsonutils
 import six
 from testtools import matchers
@@ -22,7 +23,6 @@ from keystoneclient.auth import token_endpoint
 from keystoneclient import client
 from keystoneclient import discover
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient import session
 from keystoneclient.tests.unit import utils
 from keystoneclient.v2_0 import client as v2_client

keystoneclient/tests/unit/v2_0/client_fixtures.py

@@ -13,7 +13,7 @@
 from __future__ import unicode_literals
 import uuid
 
-from keystoneclient import fixture
+from keystoneauth1 import fixture
 
 
 def unscoped_token():

keystoneclient/tests/unit/v2_0/test_access.py

@@ -13,11 +13,11 @@
 import datetime
 import uuid
 
+from keystoneauth1 import fixture
 from oslo_utils import timeutils
 import testresources
 
 from keystoneclient import access
-from keystoneclient import fixture
 from keystoneclient.tests.unit import client_fixtures as token_data
 from keystoneclient.tests.unit.v2_0 import client_fixtures
 from keystoneclient.tests.unit.v2_0 import utils

keystoneclient/tests/unit/v2_0/test_client.py

@@ -13,11 +13,11 @@
 import json
 import uuid
 
+from keystoneauth1 import fixture
 import six
 
 from keystoneclient.auth import token_endpoint
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient import session
 from keystoneclient.tests.unit.v2_0 import client_fixtures
 from keystoneclient.tests.unit.v2_0 import utils

keystoneclient/tests/unit/v2_0/test_service_catalog.py

@@ -10,9 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from keystoneauth1 import fixture
+
 from keystoneclient import access
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient.tests.unit.v2_0 import client_fixtures
 from keystoneclient.tests.unit.v2_0 import utils
 

keystoneclient/tests/unit/v2_0/test_tenants.py

@@ -12,8 +12,9 @@
 
 import uuid
 
+from keystoneauth1 import fixture
+
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import client
 from keystoneclient.v2_0 import tenants

keystoneclient/tests/unit/v2_0/test_tokens.py

@@ -12,9 +12,10 @@
 
 import uuid
 
+from keystoneauth1 import fixture
+
 from keystoneclient import access
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient.tests.unit.v2_0 import utils
 from keystoneclient.v2_0 import client
 from keystoneclient.v2_0 import tokens

keystoneclient/tests/unit/v3/client_fixtures.py

@@ -13,7 +13,7 @@
 from __future__ import unicode_literals
 import uuid
 
-from keystoneclient import fixture
+from keystoneauth1 import fixture
 
 
 def unscoped_token(**kwargs):

keystoneclient/tests/unit/v3/test_access.py

@@ -13,10 +13,10 @@
 import datetime
 import uuid
 
+from keystoneauth1 import fixture
 from oslo_utils import timeutils
 
 from keystoneclient import access
-from keystoneclient import fixture
 from keystoneclient.tests.unit import utils as test_utils
 from keystoneclient.tests.unit.v3 import client_fixtures
 from keystoneclient.tests.unit.v3 import utils

keystoneclient/tests/unit/v3/test_auth_manager.py

@@ -12,7 +12,8 @@
 
 import uuid
 
-from keystoneclient import fixture
+from keystoneauth1 import fixture
+
 from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import auth
 

keystoneclient/tests/unit/v3/test_federation.py

@@ -13,7 +13,7 @@
 import copy
 import uuid
 
-from keystoneauth1 import fixture as auth_fixture
+from keystoneauth1 import fixture
 from keystoneauth1.identity import v3
 from keystoneauth1 import session
 from keystoneauth1.tests.unit import k2k_fixtures
@@ -22,7 +22,6 @@ from testtools import matchers
 
 from keystoneclient import access
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient.tests.unit.v3 import utils
 from keystoneclient.v3 import client
 from keystoneclient.v3.contrib.federation import base
@@ -385,7 +384,7 @@ class K2KFederatedProjectTests(utils.TestCase):
 
     def setUp(self):
         super(K2KFederatedProjectTests, self).setUp()
-        self.token_v3 = auth_fixture.V3Token()
+        self.token_v3 = fixture.V3Token()
         self.token_v3.add_service_provider(
             self.SP_ID, self.SP_AUTH_URL, self.SP_URL)
         self.session = session.Session()
@@ -414,7 +413,7 @@ class K2KFederatedProjectTests(utils.TestCase):
         # We need to check the auth versions available
         self.requests_mock.get(
             self.TEST_URL,
-            json={'version': auth_fixture.V3Discovery(self.TEST_URL)},
+            json={'version': fixture.V3Discovery(self.TEST_URL)},
             headers={'Content-Type': 'application/json'})
 
         # The identity provider receives a request for an ECP wrapped
@@ -455,7 +454,7 @@ class K2KFederatedProjectTests(utils.TestCase):
             self.collection_key: [self.new_ref(), self.new_ref()]
         })
         self.requests_mock.get(self.SP_ROOT_URL, json={
-            'version': auth_fixture.discovery.V3Discovery(self.SP_ROOT_URL)
+            'version': fixture.discovery.V3Discovery(self.SP_ROOT_URL)
         })
         returned_list = k2k_client.federation.projects.list()
 

keystoneclient/tests/unit/v3/test_service_catalog.py

@@ -10,9 +10,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from keystoneauth1 import fixture
+
 from keystoneclient import access
 from keystoneclient import exceptions
-from keystoneclient import fixture
 from keystoneclient.tests.unit import utils as test_utils
 from keystoneclient.tests.unit.v3 import client_fixtures
 from keystoneclient.tests.unit.v3 import utils