commit e7740ea8e6cd7ff76be57d5c467e51c238616391
author Emilien Macchi <emilien@redhat.com> Tue Feb 09 20:13:13 2016 +0000
committer David Moreau Simard <dms@redhat.com> Wed Feb 10 14:39:21 2016 +0000
tree 092a507a60b4d1d4755c9d58aea7c94fb8c75727
parent ade168405087243271ab8670c77bf2ea3790a817

Revert "Remove setup_credentials from orchestration tests"

This patch generates failures on non-devstack trunk CI.
With tempest installed from source and running heat from master branch
we are seeing issues as described in the linked bug.

Partial-Bug: #1543785
This reverts commit ade168405087243271ab8670c77bf2ea3790a817.

Change-Id: I5ba1ebdc9e28e035eec9cc4b8ad765740b394ddf

tempest/api/orchestration/base.py

diff --git a/tempest/api/orchestration/base.py b/tempest/api/orchestration/base.py
index f833bf3..c93b5ed 100644
--- a/tempest/api/orchestration/base.py
+++ b/tempest/api/orchestration/base.py
@@ -34,6 +34,12 @@
             raise cls.skipException("Heat support is required")
 
     @classmethod
+    def setup_credentials(cls):
+        super(BaseOrchestrationTest, cls).setup_credentials()
+        stack_owner_role = CONF.orchestration.stack_owner_role
+        cls.os = cls.get_client_manager(roles=[stack_owner_role])
+
+    @classmethod
     def setup_clients(cls):
         super(BaseOrchestrationTest, cls).setup_clients()
         cls.orchestration_client = cls.os.orchestration_client

tempest/api/orchestration/stacks/test_neutron_resources.py

diff --git a/tempest/api/orchestration/stacks/test_neutron_resources.py b/tempest/api/orchestration/stacks/test_neutron_resources.py
index 3c9dcb1..09e863e 100644
--- a/tempest/api/orchestration/stacks/test_neutron_resources.py
+++ b/tempest/api/orchestration/stacks/test_neutron_resources.py
@@ -35,6 +35,11 @@
             raise cls.skipException("Neutron support is required")
 
     @classmethod
+    def setup_credentials(cls):
+        cls.set_network_resources()
+        super(NeutronResourcesTestJSON, cls).setup_credentials()
+
+    @classmethod
     def setup_clients(cls):
         super(NeutronResourcesTestJSON, cls).setup_clients()
         cls.network_client = cls.os.network_client

tempest/api/orchestration/stacks/test_swift_resources.py

diff --git a/tempest/api/orchestration/stacks/test_swift_resources.py b/tempest/api/orchestration/stacks/test_swift_resources.py
index fea5e37..c0f1c4b 100644
--- a/tempest/api/orchestration/stacks/test_swift_resources.py
+++ b/tempest/api/orchestration/stacks/test_swift_resources.py
@@ -30,6 +30,14 @@
             raise cls.skipException("Swift support is required")
 
     @classmethod
+    def setup_credentials(cls):
+        super(SwiftResourcesTestJSON, cls).setup_credentials()
+        stack_owner_role = CONF.orchestration.stack_owner_role
+        operator_role = CONF.object_storage.operator_role
+        cls.os = cls.get_client_manager(
+            roles=[stack_owner_role, operator_role])
+
+    @classmethod
     def setup_clients(cls):
         super(SwiftResourcesTestJSON, cls).setup_clients()
         cls.account_client = cls.os.account_client