Code Review / snaps.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Added members to VmInst that will contain the availability_zone
[snaps.git] / snaps / openstack / tests / create_stack_tests.py
diff --git a/snaps/openstack/tests/create_stack_tests.py b/snaps/openstack/tests/create_stack_tests.py
index 6041735..ad8ac31 100644 (file)
--- a/snaps/openstack/tests/create_stack_tests.py
+++ b/snaps/openstack/tests/create_stack_tests.py
@@ -39,7 +39,8 @@ from snaps.openstack.create_stack import (
     StackSettings, StackCreationError, StackError, OpenStackHeatStack)
 from snaps.openstack.tests import openstack_tests, create_instance_tests
 from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase
     StackSettings, StackCreationError, StackError, OpenStackHeatStack)
 from snaps.openstack.tests import openstack_tests, create_instance_tests
 from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase
-from snaps.openstack.utils import heat_utils, neutron_utils, nova_utils
+from snaps.openstack.utils import (
+    heat_utils, neutron_utils, nova_utils, keystone_utils)
 
 __author__ = 'spisarski'
 
 
 __author__ = 'spisarski'
 
@@ -132,19 +133,17 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
     """
 
     def setUp(self):
     """
 
     def setUp(self):
+        self.user_roles = ['heat_stack_owner']
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
-        self.heat_cli = heat_utils.heat_client(self.heat_creds)
+        self.heat_cli = heat_utils.heat_client(self.os_creds)
         self.stack_creator = None
 
         self.image_creator = OpenStackImage(
         self.stack_creator = None
 
         self.image_creator = OpenStackImage(
-            self.heat_creds, openstack_tests.cirros_image_settings(
+            self.os_creds, openstack_tests.cirros_image_settings(
                 name=self.guid + '-image',
                 image_metadata=self.image_metadata))
         self.image_creator.create()
                 name=self.guid + '-image',
                 image_metadata=self.image_metadata))
         self.image_creator.create()
@@ -206,7 +205,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
@@ -230,7 +229,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
             env_values=self.env_values, stack_create_timeout=0)
 
         self.stack_creator = OpenStackHeatStack(
             env_values=self.env_values, stack_create_timeout=0)
 
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         with self.assertRaises(StackCreationError):
             self.stack_creator.create()
 
         with self.assertRaises(StackCreationError):
             self.stack_creator.create()
 
@@ -248,7 +247,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
             template=template_dict,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template=template_dict,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
@@ -272,7 +271,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
             template=template_dict,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template=template_dict,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
@@ -316,7 +315,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
             template=template_dict,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template=template_dict,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         created_stack1 = self.stack_creator.create()
 
         retrieved_stack = heat_utils.get_stack_by_id(self.heat_cli,
         created_stack1 = self.stack_creator.create()
 
         retrieved_stack = heat_utils.get_stack_by_id(self.heat_cli,
@@ -327,7 +326,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
         self.assertEqual(0, len(self.stack_creator.get_outputs()))
 
         # Should be retrieving the instance data
         self.assertEqual(0, len(self.stack_creator.get_outputs()))
 
         # Should be retrieving the instance data
-        stack_creator2 = OpenStackHeatStack(self.heat_creds, stack_settings)
+        stack_creator2 = OpenStackHeatStack(self.os_creds, stack_settings)
         stack2 = stack_creator2.create()
         self.assertEqual(created_stack1.id, stack2.id)
 
         stack2 = stack_creator2.create()
         self.assertEqual(created_stack1.id, stack2.id)
 
@@ -341,7 +340,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
@@ -350,9 +349,12 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
         self.assertEqual(1, len(net_creators))
         self.assertEqual(self.network_name, net_creators[0].get_network().name)
 
         self.assertEqual(1, len(net_creators))
         self.assertEqual(self.network_name, net_creators[0].get_network().name)
 
+        # Need to use 'admin' creds as heat creates objects under it's own
+        # project/tenant
         neutron = neutron_utils.neutron_client(self.os_creds)
         neutron = neutron_utils.neutron_client(self.os_creds)
+        keystone = keystone_utils.keystone_client(self.os_creds)
         net_by_name = neutron_utils.get_network(
         net_by_name = neutron_utils.get_network(
-            neutron, network_name=net_creators[0].get_network().name)
+            neutron, keystone, network_name=net_creators[0].get_network().name)
         self.assertEqual(net_creators[0].get_network(), net_by_name)
         self.assertIsNotNone(neutron_utils.get_network_by_id(
             neutron, net_creators[0].get_network().id))
         self.assertEqual(net_creators[0].get_network(), net_by_name)
         self.assertIsNotNone(neutron_utils.get_network_by_id(
             neutron, net_creators[0].get_network().id))
@@ -377,7 +379,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
 
@@ -387,13 +389,16 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
         self.assertEqual(self.vm_inst_name,
                          vm_inst_creators[0].get_vm_inst().name)
 
         self.assertEqual(self.vm_inst_name,
                          vm_inst_creators[0].get_vm_inst().name)
 
-        nova = nova_utils.nova_client(self.admin_os_creds)
-        neutron = neutron_utils.neutron_client(self.admin_os_creds)
+        nova = nova_utils.nova_client(self.os_creds)
+        neutron = neutron_utils.neutron_client(self.os_creds)
+        keystone = keystone_utils.keystone_client(self.os_creds)
         vm_inst_by_name = nova_utils.get_server(
         vm_inst_by_name = nova_utils.get_server(
-            nova, neutron, server_name=vm_inst_creators[0].get_vm_inst().name)
+            nova, neutron, keystone,
+            server_name=vm_inst_creators[0].get_vm_inst().name)
+
         self.assertEqual(vm_inst_creators[0].get_vm_inst(), vm_inst_by_name)
         self.assertIsNotNone(nova_utils.get_server_object_by_id(
         self.assertEqual(vm_inst_creators[0].get_vm_inst(), vm_inst_by_name)
         self.assertIsNotNone(nova_utils.get_server_object_by_id(
-            nova, neutron, vm_inst_creators[0].get_vm_inst().id))
+            nova, neutron, keystone, vm_inst_creators[0].get_vm_inst().id))
 
 
 class CreateStackFloatingIpTests(OSIntegrationTestCase):
 
 
 class CreateStackFloatingIpTests(OSIntegrationTestCase):
@@ -403,19 +408,17 @@ class CreateStackFloatingIpTests(OSIntegrationTestCase):
     """
 
     def setUp(self):
     """
 
     def setUp(self):
+        self.user_roles = ['heat_stack_owner', 'admin']
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
-        self.heat_cli = heat_utils.heat_client(self.heat_creds)
+        self.heat_cli = heat_utils.heat_client(self.os_creds)
         self.stack_creator = None
 
         self.image_creator = OpenStackImage(
         self.stack_creator = None
 
         self.image_creator = OpenStackImage(
-            self.heat_creds, openstack_tests.cirros_image_settings(
+            self.os_creds, openstack_tests.cirros_image_settings(
                 name=self.guid + '-image',
                 image_metadata=self.image_metadata))
         self.image_creator.create()
                 name=self.guid + '-image',
                 image_metadata=self.image_metadata))
         self.image_creator.create()
@@ -487,7 +490,7 @@ class CreateStackFloatingIpTests(OSIntegrationTestCase):
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings,
+            self.os_creds, stack_settings,
             [self.image_creator.image_settings])
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
             [self.image_creator.image_settings])
         created_stack = self.stack_creator.create()
         self.assertIsNotNone(created_stack)
@@ -512,19 +515,17 @@ class CreateStackNestedResourceTests(OSIntegrationTestCase):
     """
 
     def setUp(self):
     """
 
     def setUp(self):
+        self.user_roles = ['heat_stack_owner']
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
-        self.heat_cli = heat_utils.heat_client(self.heat_creds)
+        self.heat_cli = heat_utils.heat_client(self.os_creds)
         self.stack_creator = None
 
         self.image_creator = OpenStackImage(
         self.stack_creator = None
 
         self.image_creator = OpenStackImage(
-            self.heat_creds, openstack_tests.cirros_image_settings(
+            self.os_creds, openstack_tests.cirros_image_settings(
                 name=self.guid + '-image',
                 image_metadata=self.image_metadata))
         self.image_creator.create()
                 name=self.guid + '-image',
                 image_metadata=self.image_metadata))
         self.image_creator.create()
@@ -536,9 +537,11 @@ class CreateStackNestedResourceTests(OSIntegrationTestCase):
         self.flavor_creator.create()
 
         env_values = {
         self.flavor_creator.create()
 
         env_values = {
+            'network_name': self.guid + '-network',
             'public_network': self.ext_net_name,
             'agent_image': self.image_creator.image_settings.name,
             'agent_flavor': self.flavor_creator.flavor_settings.name,
             'public_network': self.ext_net_name,
             'agent_image': self.image_creator.image_settings.name,
             'agent_flavor': self.flavor_creator.flavor_settings.name,
+            'key_name': self.guid + '-key',
         }
 
         heat_tmplt_path = pkg_resources.resource_filename(
         }
 
         heat_tmplt_path = pkg_resources.resource_filename(
@@ -553,7 +556,7 @@ class CreateStackNestedResourceTests(OSIntegrationTestCase):
             env_values=env_values)
 
         self.stack_creator = OpenStackHeatStack(
             env_values=env_values)
 
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings,
+            self.os_creds, stack_settings,
             [self.image_creator.image_settings])
 
         self.vm_inst_creators = list()
             [self.image_creator.image_settings])
 
         self.vm_inst_creators = list()
@@ -623,14 +626,13 @@ class CreateStackRouterTests(OSIntegrationTestCase):
         Instantiates the CreateStack object that is responsible for downloading
         and creating an OS stack file within OpenStack
         """
         Instantiates the CreateStack object that is responsible for downloading
         and creating an OS stack file within OpenStack
         """
+        self.user_roles = ['heat_stack_owner']
+
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
-        self.heat_cli = heat_utils.heat_client(self.heat_creds)
+        self.heat_cli = heat_utils.heat_client(self.os_creds)
         self.neutron = neutron_utils.neutron_client(self.os_creds)
         self.stack_creator = None
 
         self.neutron = neutron_utils.neutron_client(self.os_creds)
         self.stack_creator = None
 
@@ -652,7 +654,7 @@ class CreateStackRouterTests(OSIntegrationTestCase):
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
@@ -682,7 +684,7 @@ class CreateStackRouterTests(OSIntegrationTestCase):
         router = creator.get_router()
 
         ext_net = neutron_utils.get_network(
         router = creator.get_router()
 
         ext_net = neutron_utils.get_network(
-            self.neutron, network_name=self.ext_net_name)
+            self.neutron, self.keystone, network_name=self.ext_net_name)
         self.assertEqual(ext_net.id, router.external_network_id)
 
 
         self.assertEqual(ext_net.id, router.external_network_id)
 
 
@@ -694,14 +696,13 @@ class CreateStackVolumeTests(OSIntegrationTestCase):
 
     def setUp(self):
 
 
     def setUp(self):
 
+        self.user_roles = ['heat_stack_owner', 'admin']
+
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
-        self.heat_cli = heat_utils.heat_client(self.heat_creds)
+        self.heat_cli = heat_utils.heat_client(self.os_creds)
         self.stack_creator = None
 
         self.volume_name = self.guid + '-volume'
         self.stack_creator = None
 
         self.volume_name = self.guid + '-volume'
@@ -719,7 +720,7 @@ class CreateStackVolumeTests(OSIntegrationTestCase):
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
@@ -789,14 +790,13 @@ class CreateStackFlavorTests(OSIntegrationTestCase):
 
     def setUp(self):
 
 
     def setUp(self):
 
+        self.user_roles = ['heat_stack_owner', 'admin']
+
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
-        self.heat_cli = heat_utils.heat_client(self.heat_creds)
+        self.heat_cli = heat_utils.heat_client(self.os_creds)
         self.stack_creator = None
 
         self.heat_tmplt_path = pkg_resources.resource_filename(
         self.stack_creator = None
 
         self.heat_tmplt_path = pkg_resources.resource_filename(
@@ -806,7 +806,7 @@ class CreateStackFlavorTests(OSIntegrationTestCase):
             name=self.guid + '-stack',
             template_path=self.heat_tmplt_path)
         self.stack_creator = OpenStackHeatStack(
             name=self.guid + '-stack',
             template_path=self.heat_tmplt_path)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
@@ -849,15 +849,14 @@ class CreateStackKeypairTests(OSIntegrationTestCase):
 
     def setUp(self):
 
 
     def setUp(self):
 
+        self.user_roles = ['heat_stack_owner']
+
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
-        self.heat_cli = heat_utils.heat_client(self.heat_creds)
-        self.nova = nova_utils.nova_client(self.heat_creds)
+        self.heat_cli = heat_utils.heat_client(self.os_creds)
+        self.nova = nova_utils.nova_client(self.os_creds)
         self.stack_creator = None
 
         self.keypair_name = self.guid + '-kp'
         self.stack_creator = None
 
         self.keypair_name = self.guid + '-kp'
@@ -873,7 +872,7 @@ class CreateStackKeypairTests(OSIntegrationTestCase):
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
@@ -934,15 +933,14 @@ class CreateStackSecurityGroupTests(OSIntegrationTestCase):
         Instantiates the CreateStack object that is responsible for downloading
         and creating an OS stack file within OpenStack
         """
         Instantiates the CreateStack object that is responsible for downloading
         and creating an OS stack file within OpenStack
         """
+        self.user_roles = ['heat_stack_owner']
+
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
-        self.heat_cli = heat_utils.heat_client(self.heat_creds)
-        self.nova = nova_utils.nova_client(self.heat_creds)
+        self.heat_cli = heat_utils.heat_client(self.os_creds)
+        self.nova = nova_utils.nova_client(self.os_creds)
         self.stack_creator = None
 
         self.security_group_name = self.guid + '-sec-grp'
         self.stack_creator = None
 
         self.security_group_name = self.guid + '-sec-grp'
@@ -958,7 +956,7 @@ class CreateStackSecurityGroupTests(OSIntegrationTestCase):
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
         self.created_stack = self.stack_creator.create()
         self.assertIsNotNone(self.created_stack)
 
@@ -1024,12 +1022,10 @@ class CreateStackNegativeTests(OSIntegrationTestCase):
     """
 
     def setUp(self):
     """
 
     def setUp(self):
+        self.user_roles = ['heat_stack_owner']
 
         super(self.__class__, self).__start__()
 
 
         super(self.__class__, self).__start__()
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
         self.stack_name = self.__class__.__name__ + '-' + str(uuid.uuid4())
         self.stack_creator = None
         self.heat_tmplt_path = pkg_resources.resource_filename(
         self.stack_name = self.__class__.__name__ + '-' + str(uuid.uuid4())
         self.stack_creator = None
         self.heat_tmplt_path = pkg_resources.resource_filename(
@@ -1047,7 +1043,7 @@ class CreateStackNegativeTests(OSIntegrationTestCase):
         stack_settings = StackConfig(name=self.stack_name,
                                      template_path=self.heat_tmplt_path)
         self.stack_creator = OpenStackHeatStack(
         stack_settings = StackConfig(name=self.stack_name,
                                      template_path=self.heat_tmplt_path)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         with self.assertRaises(HTTPBadRequest):
             self.stack_creator.create()
 
         with self.assertRaises(HTTPBadRequest):
             self.stack_creator.create()
 
@@ -1058,7 +1054,7 @@ class CreateStackNegativeTests(OSIntegrationTestCase):
         stack_settings = StackConfig(
             name=self.stack_name, template_path='foo')
         self.stack_creator = OpenStackHeatStack(
         stack_settings = StackConfig(
             name=self.stack_name, template_path='foo')
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
         with self.assertRaises(IOError):
             self.stack_creator.create()
 
         with self.assertRaises(IOError):
             self.stack_creator.create()
 
@@ -1071,21 +1067,19 @@ class CreateStackFailureTests(OSIntegrationTestCase):
     """
 
     def setUp(self):
     """
 
     def setUp(self):
+        self.user_roles = ['heat_stack_owner']
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
 
         super(self.__class__, self).__start__()
 
         self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
 
-        self.heat_creds = self.admin_os_creds
-        self.heat_creds.project_name = self.admin_os_creds.project_name
-
-        self.heat_cli = heat_utils.heat_client(self.heat_creds)
+        self.heat_cli = heat_utils.heat_client(self.os_creds)
         self.stack_creator = None
 
         self.tmp_file = file_utils.save_string_to_file(
             ' ', str(uuid.uuid4()) + '-bad-image')
         self.image_creator = OpenStackImage(
         self.stack_creator = None
 
         self.tmp_file = file_utils.save_string_to_file(
             ' ', str(uuid.uuid4()) + '-bad-image')
         self.image_creator = OpenStackImage(
-            self.heat_creds, ImageConfig(
+            self.os_creds, ImageConfig(
                 name=self.guid + 'image', image_file=self.tmp_file.name,
                 image_user='foo', img_format='qcow2'))
         self.image_creator.create()
                 name=self.guid + 'image', image_file=self.tmp_file.name,
                 image_user='foo', img_format='qcow2'))
         self.image_creator.create()
@@ -1155,7 +1149,7 @@ class CreateStackFailureTests(OSIntegrationTestCase):
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
             template_path=self.heat_tmplt_path,
             env_values=self.env_values)
         self.stack_creator = OpenStackHeatStack(
-            self.heat_creds, stack_settings)
+            self.os_creds, stack_settings)
 
         with self.assertRaises(StackError):
             try:
 
         with self.assertRaises(StackError):
             try: