commit 7322467e0ba75694d867cf0513bb2378295a0dca
author Andrea Frittoli <andrea.frittoli@gmail.com> Fri Dec 09 21:08:19 2016 +0000
committer Andrea Frittoli <andrea.frittoli@gmail.com> Mon Dec 12 14:14:32 2016 +0000
tree ec6e560bbd8d12dec654ddceadd7c900d6cbb3df
parent 28d142be69fc0f9b925fd9596d41f1576d6f3700

Set auth in clients before they are used

When credentials are preprovisioned, and thus read from a file,
only the fields configured in accounts.yaml are available in the
credentials object. Several tests rely on used_id / project_id
being available in the credentials object. To ensure a consistent
behaviour between dynamic and preprovisioned credentials, setting
auth in the client manager before it is returned to the test, so
that all fields are available.

test_security_groups_basic_ops has its own solution for filling in
IDs, which is broken, so removing it and let it rely on the IDs
being there.

Change-Id: I3450c055c63782a97413606f90ad77b7dba452f1
Partial-bug: #1609156

tempest/scenario/test_security_groups_basic_ops.py

diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py
index 32f5d9f..1360b09 100644
--- a/tempest/scenario/test_security_groups_basic_ops.py
+++ b/tempest/scenario/test_security_groups_basic_ops.py
@@ -15,7 +15,6 @@
 from oslo_log import log
 import testtools
 
-from tempest import clients
 from tempest.common.utils import data_utils
 from tempest.common.utils import net_info
 from tempest import config
@@ -113,9 +112,9 @@
             access point
         """
 
-        def __init__(self, credentials):
-            self.manager = clients.Manager(credentials)
+        def __init__(self, clients):
             # Credentials from manager are filled with both names and IDs
+            self.manager = clients
             self.creds = self.manager.credentials
             self.network = None
             self.subnet = None
@@ -152,11 +151,6 @@
         # Create no network resources for these tests.
         cls.set_network_resources()
         super(TestSecurityGroupsBasicOps, cls).setup_credentials()
-        # TODO(mnewby) Consider looking up entities as needed instead
-        # of storing them as collections on the class.
-
-        # Credentials from the manager are filled with both IDs and Names
-        cls.alt_creds = cls.alt_manager.credentials
 
     @classmethod
     def resource_setup(cls):
@@ -171,9 +165,8 @@
 
         cls.floating_ips = {}
         cls.tenants = {}
-        creds = cls.manager.credentials
-        cls.primary_tenant = cls.TenantProperties(creds)
-        cls.alt_tenant = cls.TenantProperties(cls.alt_creds)
+        cls.primary_tenant = cls.TenantProperties(cls.os)
+        cls.alt_tenant = cls.TenantProperties(cls.os_alt)
         for tenant in [cls.primary_tenant, cls.alt_tenant]:
             cls.tenants[tenant.creds.tenant_id] = tenant
 

tempest/test.py

diff --git a/tempest/test.py b/tempest/test.py
index 93fbed3..451b876 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -504,8 +504,12 @@
             else:
                 raise lib_exc.InvalidCredentials(
                     "Invalid credentials type %s" % credential_type)
-        return cls.client_manager(credentials=creds.credentials,
-                                  service=cls._service)
+        manager = cls.client_manager(credentials=creds.credentials,
+                                     service=cls._service)
+        # NOTE(andreaf) Ensure credentials have user and project id fields.
+        # It may not be the case when using pre-provisioned credentials.
+        manager.auth_provider.set_auth()
+        return manager
 
     @classmethod
     def clear_credentials(cls):