Merge "Use tempest-lib's fake_auth_provider on services"
diff --git a/tempest/tests/services/compute/test_agents_client.py b/tempest/tests/services/compute/test_agents_client.py
index 01035ab..31e576e 100644
--- a/tempest/tests/services/compute/test_agents_client.py
+++ b/tempest/tests/services/compute/test_agents_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import agents_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_aggregates_client.py b/tempest/tests/services/compute/test_aggregates_client.py
index 8184a46..e92b76b 100644
--- a/tempest/tests/services/compute/test_aggregates_client.py
+++ b/tempest/tests/services/compute/test_aggregates_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import aggregates_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_availability_zone_client.py b/tempest/tests/services/compute/test_availability_zone_client.py
index 715cfd7..6100f44 100644
--- a/tempest/tests/services/compute/test_availability_zone_client.py
+++ b/tempest/tests/services/compute/test_availability_zone_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import availability_zone_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_baremetal_nodes_client.py b/tempest/tests/services/compute/test_baremetal_nodes_client.py
index edf9014..86c035c 100644
--- a/tempest/tests/services/compute/test_baremetal_nodes_client.py
+++ b/tempest/tests/services/compute/test_baremetal_nodes_client.py
@@ -14,8 +14,9 @@
import copy
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import baremetal_nodes_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_certificates_client.py b/tempest/tests/services/compute/test_certificates_client.py
index c926fce..2ba90d0 100644
--- a/tempest/tests/services/compute/test_certificates_client.py
+++ b/tempest/tests/services/compute/test_certificates_client.py
@@ -14,8 +14,9 @@
import copy
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import certificates_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_extensions_client.py b/tempest/tests/services/compute/test_extensions_client.py
index 86f81f3..21efc52 100644
--- a/tempest/tests/services/compute/test_extensions_client.py
+++ b/tempest/tests/services/compute/test_extensions_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import extensions_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_fixedIPs_client.py b/tempest/tests/services/compute/test_fixedIPs_client.py
index d7a9694..5acb422 100644
--- a/tempest/tests/services/compute/test_fixedIPs_client.py
+++ b/tempest/tests/services/compute/test_fixedIPs_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import fixed_ips_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_floating_ip_pools_client.py b/tempest/tests/services/compute/test_floating_ip_pools_client.py
index 0d19b7b..1cb4bf3 100644
--- a/tempest/tests/services/compute/test_floating_ip_pools_client.py
+++ b/tempest/tests/services/compute/test_floating_ip_pools_client.py
@@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
from tempest.services.compute.json import floating_ip_pools_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_floating_ips_bulk_client.py b/tempest/tests/services/compute/test_floating_ips_bulk_client.py
index 6cf1b17..600985b 100644
--- a/tempest/tests/services/compute/test_floating_ips_bulk_client.py
+++ b/tempest/tests/services/compute/test_floating_ips_bulk_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import floating_ips_bulk_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_instance_usage_audit_log_client.py b/tempest/tests/services/compute/test_instance_usage_audit_log_client.py
index d4bc889..b4af9d5 100644
--- a/tempest/tests/services/compute/test_instance_usage_audit_log_client.py
+++ b/tempest/tests/services/compute/test_instance_usage_audit_log_client.py
@@ -14,8 +14,9 @@
import datetime
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import instance_usage_audit_log_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_keypairs_client.py b/tempest/tests/services/compute/test_keypairs_client.py
index 6ad187b..8b1a9a8 100644
--- a/tempest/tests/services/compute/test_keypairs_client.py
+++ b/tempest/tests/services/compute/test_keypairs_client.py
@@ -14,8 +14,9 @@
import copy
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import keypairs_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_limits_client.py b/tempest/tests/services/compute/test_limits_client.py
index 0036a3d..733d3d1 100644
--- a/tempest/tests/services/compute/test_limits_client.py
+++ b/tempest/tests/services/compute/test_limits_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import limits_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_migrations_client.py b/tempest/tests/services/compute/test_migrations_client.py
index 83fe461..55f2ef2 100644
--- a/tempest/tests/services/compute/test_migrations_client.py
+++ b/tempest/tests/services/compute/test_migrations_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import migrations_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_networks_client.py b/tempest/tests/services/compute/test_networks_client.py
index b47430b..cec8262 100644
--- a/tempest/tests/services/compute/test_networks_client.py
+++ b/tempest/tests/services/compute/test_networks_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import networks_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_quota_classes_client.py b/tempest/tests/services/compute/test_quota_classes_client.py
index f4fc51a..29800a2 100644
--- a/tempest/tests/services/compute/test_quota_classes_client.py
+++ b/tempest/tests/services/compute/test_quota_classes_client.py
@@ -14,8 +14,9 @@
import copy
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import quota_classes_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_quotas_client.py b/tempest/tests/services/compute/test_quotas_client.py
index 68f74aa..9a9d8fe 100644
--- a/tempest/tests/services/compute/test_quotas_client.py
+++ b/tempest/tests/services/compute/test_quotas_client.py
@@ -14,8 +14,9 @@
import copy
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import quotas_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_security_group_default_rules_client.py b/tempest/tests/services/compute/test_security_group_default_rules_client.py
index 75fa1cb..99ab305 100644
--- a/tempest/tests/services/compute/test_security_group_default_rules_client.py
+++ b/tempest/tests/services/compute/test_security_group_default_rules_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import security_group_default_rules_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_security_groups_client.py b/tempest/tests/services/compute/test_security_groups_client.py
index 7a39048..9e40b96 100644
--- a/tempest/tests/services/compute/test_security_groups_client.py
+++ b/tempest/tests/services/compute/test_security_groups_client.py
@@ -14,9 +14,9 @@
from oslotest import mockpatch
from tempest_lib import exceptions as lib_exc
+from tempest_lib.tests import fake_auth_provider
from tempest.services.compute.json import security_groups_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_server_groups_client.py b/tempest/tests/services/compute/test_server_groups_client.py
index 253dac1..5e058d6 100644
--- a/tempest/tests/services/compute/test_server_groups_client.py
+++ b/tempest/tests/services/compute/test_server_groups_client.py
@@ -15,9 +15,9 @@
import httplib2
from oslotest import mockpatch
+from tempest_lib.tests import fake_auth_provider
from tempest.services.compute.json import server_groups_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_services_client.py b/tempest/tests/services/compute/test_services_client.py
index e5a25ab..fce28e8 100644
--- a/tempest/tests/services/compute/test_services_client.py
+++ b/tempest/tests/services/compute/test_services_client.py
@@ -14,8 +14,9 @@
import copy
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import services_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_tenant_networks_client.py b/tempest/tests/services/compute/test_tenant_networks_client.py
index dc2de00..691792a 100644
--- a/tempest/tests/services/compute/test_tenant_networks_client.py
+++ b/tempest/tests/services/compute/test_tenant_networks_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import tenant_networks_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
diff --git a/tempest/tests/services/compute/test_tenant_usages_client.py b/tempest/tests/services/compute/test_tenant_usages_client.py
index 8a2c1a4..58e0b7a 100644
--- a/tempest/tests/services/compute/test_tenant_usages_client.py
+++ b/tempest/tests/services/compute/test_tenant_usages_client.py
@@ -12,8 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest_lib.tests import fake_auth_provider
+
from tempest.services.compute.json import tenant_usages_client
-from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base