Migrate all tests to use dummy_context.

Change-Id: Idc00ccbd254aca2c64c1bcb376fe7a3aab4d1cb4

diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py
index 57cfe8f20f7518273452f7df3889680ab86d925b..5dd18f94f9103557a1172531d7cc2fc5adeabdff 100644 (file)
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@ -17,7 +17,6 @@ import os
 
 from oslo.config import cfg
 
-from heat.common import context
 from heat.common import identifier
 from heat.common import policy
 from heat.openstack.common import rpc
@@ -27,6 +26,7 @@ from heat.rpc import api as rpc_api
 from heat.api.aws import exception
 import heat.api.cfn.v1.stacks as stacks
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 
 policy_path = os.path.dirname(os.path.realpath(__file__)) + "/policy/"
 
@@ -36,21 +36,13 @@ class CfnStackControllerTest(HeatTestCase):
     Tests the API class which acts as the WSGI controller,
     the endpoint processing API requests after they are routed
     '''
-    # Utility functions
-    def _create_context(self, user='api_test_user'):
-        ctx = context.get_admin_context()
-        self.m.StubOutWithMock(ctx, 'username')
-        ctx.username = user
-        self.m.StubOutWithMock(ctx, 'tenant_id')
-        ctx.tenant_id = 't'
-        return ctx
 
     def _dummy_GET_request(self, params={}):
         # Mangle the params dict into a query string
         qs = "&".join(["=".join([k, str(params[k])]) for k in params])
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': qs}
         req = Request(environ)
-        req.context = self._create_context()
+        req.context = dummy_context()
         return req
 
     # The tests

diff --git a/heat/tests/test_api_cloudwatch.py b/heat/tests/test_api_cloudwatch.py
index cd2379868df7c5e8f788879f7e78350e7e7c130a..1b38ff76f8f0c6ac13a172fa908b8e62c48cd854 100644 (file)
--- a/heat/tests/test_api_cloudwatch.py
+++ b/heat/tests/test_api_cloudwatch.py
@@ -16,7 +16,6 @@ import os
 
 from oslo.config import cfg
 
-from heat.common import context
 from heat.common import policy
 from heat.openstack.common import rpc
 from heat.common.wsgi import Request
@@ -24,6 +23,7 @@ from heat.api.aws import exception
 import heat.api.cloudwatch.watch as watches
 from heat.rpc import api as engine_api
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 
 
 class WatchControllerTest(HeatTestCase):
@@ -31,19 +31,13 @@ class WatchControllerTest(HeatTestCase):
     Tests the API class which acts as the WSGI controller,
     the endpoint processing API requests after they are routed
     '''
-    # Utility functions
-    def _create_context(self, user='api_test_user'):
-        ctx = context.get_admin_context()
-        self.m.StubOutWithMock(ctx, 'username')
-        ctx.username = user
-        return ctx
 
     def _dummy_GET_request(self, params={}):
         # Mangle the params dict into a query string
         qs = "&".join(["=".join([k, str(params[k])]) for k in params])
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': qs}
         req = Request(environ)
-        req.context = self._create_context()
+        req.context = dummy_context()
         return req
 
     # The tests

diff --git a/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py
index 2af4cbe899c264d09d589837664988bb78565293..10b1b0c91945342f10ee3e4c2f797e9913cd9e60 100644 (file)
--- a/heat/tests/test_api_openstack_v1.py
+++ b/heat/tests/test_api_openstack_v1.py
@@ -17,7 +17,6 @@ import json
 from oslo.config import cfg
 import webob.exc
 
-from heat.common import context
 from heat.common import identifier
 from heat.openstack.common import rpc
 import heat.openstack.common.rpc.common as rpc_common
@@ -31,6 +30,7 @@ import heat.api.openstack.v1.stacks as stacks
 import heat.api.openstack.v1.resources as resources
 import heat.api.openstack.v1.events as events
 import heat.api.openstack.v1.actions as actions
+from heat.tests.utils import dummy_context
 
 
 class InstantiationDataTest(HeatTestCase):
@@ -185,14 +185,6 @@ class ControllerTest(object):
         self.api_version = '1.0'
         self.tenant = 't'
 
-    def _create_context(self, user='api_test_user'):
-        ctx = context.get_admin_context()
-        self.m.StubOutWithMock(ctx, 'username')
-        ctx.username = user
-        self.m.StubOutWithMock(ctx, 'tenant_id')
-        ctx.tenant_id = self.tenant
-        return ctx
-
     def _environ(self, path):
         return {
             'SERVER_NAME': 'heat.example.com',
@@ -207,7 +199,7 @@ class ControllerTest(object):
         environ['REQUEST_METHOD'] = method
 
         req = Request(environ)
-        req.context = self._create_context()
+        req.context = dummy_context('api_test_user', self.tenant)
         return req
 
     def _get(self, path):
@@ -222,7 +214,7 @@ class ControllerTest(object):
         environ['REQUEST_METHOD'] = method
 
         req = Request(environ)
-        req.context = self._create_context()
+        req.context = dummy_context('api_test_user', self.tenant)
         req.body = data
         return req
 

diff --git a/heat/tests/test_clouddatabase.py b/heat/tests/test_clouddatabase.py
index e135b805baba14523d84d60656d263c14b8875b0..4d7fbbb418ab960808c674901a8c0774fb6a9f65 100644 (file)
--- a/heat/tests/test_clouddatabase.py
+++ b/heat/tests/test_clouddatabase.py
@@ -21,6 +21,7 @@ from heat.engine import resource
 from heat.engine.resources.rackspace import clouddatabase
 from heat.openstack.common import uuidutils
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 
@@ -84,7 +85,7 @@ class CloudDBInstanceTest(HeatTestCase):
         stack_name = '%s_stack' % name
         t = template_format.parse(wp_template)
         template = parser.Template(t)
-        stack = parser.Stack(None,
+        stack = parser.Stack(dummy_context(),
                              stack_name,
                              template,
                              environment.Environment({'InstanceName': 'Test',

diff --git a/heat/tests/test_common_policy.py b/heat/tests/test_common_policy.py
index e8d0f8468d20f2ddf775451326caad047119cbf9..45910b1097018dd68a8cb1d9a6c921e68e620a4c 100644 (file)
--- a/heat/tests/test_common_policy.py
+++ b/heat/tests/test_common_policy.py
@@ -17,10 +17,10 @@ import os.path
 
 from oslo.config import cfg
 
-from heat.common import context
 from heat.common import policy
 from heat.common import exception
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 
 policy_path = os.path.dirname(os.path.realpath(__file__)) + "/policy/"
 
@@ -49,7 +49,7 @@ class TestPolicyEnforcer(HeatTestCase):
     def test_policy_cfn_default(self):
         enforcer = policy.Enforcer(scope='cloudformation')
 
-        ctx = context.RequestContext(roles=[])
+        ctx = dummy_context(roles=[])
         for action in self.cfn_actions:
             # Everything should be allowed
             enforcer.enforce(ctx, action, {})
@@ -62,7 +62,7 @@ class TestPolicyEnforcer(HeatTestCase):
 
         enforcer = policy.Enforcer(scope='cloudformation')
 
-        ctx = context.RequestContext(roles=[])
+        ctx = dummy_context(roles=[])
         for action in self.cfn_actions:
             # Everything should raise the default exception.Forbidden
             self.assertRaises(exception.Forbidden, enforcer.enforce, ctx,
@@ -77,7 +77,7 @@ class TestPolicyEnforcer(HeatTestCase):
 
         enforcer = policy.Enforcer(scope='cloudformation')
 
-        ctx = context.RequestContext(roles=['heat_stack_user'])
+        ctx = dummy_context(roles=['heat_stack_user'])
         for action in self.cfn_actions:
             # Everything apart from DescribeStackResource should be Forbidden
             if action == "DescribeStackResource":
@@ -95,7 +95,7 @@ class TestPolicyEnforcer(HeatTestCase):
 
         enforcer = policy.Enforcer(scope='cloudformation')
 
-        ctx = context.RequestContext(roles=['not_a_stack_user'])
+        ctx = dummy_context(roles=['not_a_stack_user'])
         for action in self.cfn_actions:
             # Everything should be allowed
             enforcer.enforce(ctx, action, {})
@@ -109,7 +109,7 @@ class TestPolicyEnforcer(HeatTestCase):
 
         enforcer = policy.Enforcer(scope='cloudwatch')
 
-        ctx = context.RequestContext(roles=['heat_stack_user'])
+        ctx = dummy_context(roles=['heat_stack_user'])
         for action in self.cw_actions:
             # Everything apart from PutMetricData should be Forbidden
             if action == "PutMetricData":
@@ -127,7 +127,7 @@ class TestPolicyEnforcer(HeatTestCase):
 
         enforcer = policy.Enforcer(scope='cloudwatch')
 
-        ctx = context.RequestContext(roles=['not_a_stack_user'])
+        ctx = dummy_context(roles=['not_a_stack_user'])
         for action in self.cw_actions:
             # Everything should be allowed
             enforcer.enforce(ctx, action, {})

diff --git a/heat/tests/test_engine_api_utils.py b/heat/tests/test_engine_api_utils.py
index f176be2388c4f5ff9a03269081e47bba1796b873..517e5cfb8b9b7324b2f21a93289a9d2f5e04c63a 100644 (file)
--- a/heat/tests/test_engine_api_utils.py
+++ b/heat/tests/test_engine_api_utils.py
@@ -12,7 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heat.common import context
 import heat.engine.api as api
 from heat.engine import parser
 from heat.engine import resource
@@ -20,6 +19,7 @@ from heat.openstack.common import uuidutils
 from heat.rpc import api as rpc_api
 from heat.tests.common import HeatTestCase
 from heat.tests import generic_resource as generic_rsrc
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 
@@ -84,10 +84,6 @@ class FormatTest(HeatTestCase):
     def setUp(self):
         super(FormatTest, self).setUp()
         setup_dummy_db()
-        ctx = context.get_admin_context()
-        self.m.StubOutWithMock(ctx, 'user')
-        ctx.user = 'test_user'
-        ctx.tenant_id = 'test_tenant'
 
         template = parser.Template({
             'Resources': {
@@ -99,7 +95,7 @@ class FormatTest(HeatTestCase):
         })
         resource._register_class('GenericResourceType',
                                  generic_rsrc.GenericResource)
-        self.stack = parser.Stack(ctx, 'test_stack', template,
+        self.stack = parser.Stack(dummy_context(), 'test_stack', template,
                                   stack_id=uuidutils.generate_uuid())
 
     def test_format_stack_resource(self):

diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index edeae31615fbbaeee8407c5ef33af08ff8faa1a4..182bf1e3579feda9bba770437846626c2e23d8c4 100644 (file)
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -22,7 +22,6 @@ from testtools import matchers
 
 from oslo.config import cfg
 
-from heat.common import context
 from heat.engine import environment
 from heat.common import exception
 from heat.tests.v1_1 import fakes
@@ -38,6 +37,7 @@ from heat.engine import watchrule
 from heat.openstack.common import threadgroup
 from heat.tests.common import HeatTestCase
 from heat.tests import utils
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 
@@ -91,13 +91,13 @@ alarm_template = '''
 
 
 def create_context(mocks, user='stacks_test_user',
-                   tenant='test_admin', password='stacks_test_password'):
-    ctx = context.get_admin_context()
+                   tenant_id='test_admin', password='stacks_test_password'):
+    ctx = dummy_context()
     mocks.StubOutWithMock(ctx, 'username')
     mocks.StubOutWithMock(ctx, 'tenant_id')
     mocks.StubOutWithMock(ctx, 'password')
     ctx.username = user
-    ctx.tenant_id = tenant
+    ctx.tenant_id = tenant_id
     ctx.password = password
     return ctx
 
@@ -231,7 +231,7 @@ class StackCreateTest(HeatTestCase):
         self.assertNotEqual(stack.resources['WebServer'].ipaddress, '0.0.0.0')
 
     def test_wordpress_single_instance_stack_delete(self):
-        ctx = create_context(self.m, tenant='test_delete_tenant')
+        ctx = create_context(self.m)
         stack = get_wordpress_stack('test_stack', ctx)
         fc = setup_mocks(self.m, stack)
         self.m.ReplayAll()
@@ -262,10 +262,8 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
 
     def setUp(self):
         super(StackServiceCreateUpdateDeleteTest, self).setUp()
-        self.username = 'stack_service_create_test_user'
-        self.tenant = 'stack_service_create_test_tenant'
         setup_dummy_db()
-        self.ctx = create_context(self.m, self.username, self.tenant)
+        self.ctx = create_context(self.m)
 
         self.man = service.EngineService('a-host', 'a-topic')
 
@@ -535,10 +533,8 @@ class StackServiceSuspendResumeTest(HeatTestCase):
 
     def setUp(self):
         super(StackServiceSuspendResumeTest, self).setUp()
-        self.username = 'stack_service_suspend_test_user'
-        self.tenant = 'stack_service_suspend_test_tenant'
         setup_dummy_db()
-        self.ctx = create_context(self.m, self.username, self.tenant)
+        self.ctx = create_context(self.m)
 
         self.man = service.EngineService('a-host', 'a-topic')
 
@@ -604,10 +600,8 @@ class StackServiceTest(HeatTestCase):
     def setUp(self):
         super(StackServiceTest, self).setUp()
 
-        self.username = 'stack_service_test_user'
-        self.tenant = 'stack_service_test_tenant'
-
-        self.ctx = create_context(self.m, self.username, self.tenant)
+        self.ctx = create_context(self.m,
+                                  tenant_id='stack_service_test_tenant')
         self.eng = service.EngineService('a-host', 'a-topic')
         cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role')
 
@@ -652,8 +646,7 @@ class StackServiceTest(HeatTestCase):
         self.assertEqual(self.stack.id,
                          db_api.stack_get_by_name(self.ctx,
                                                   self.stack.name).id)
-        ctx2 = create_context(self.m, self.username,
-                              'stack_service_test_tenant2')
+        ctx2 = create_context(self.m, tenant_id='stack_service_test_tenant2')
         self.assertEqual(None, db_api.stack_get_by_name(ctx2, self.stack.name))
 
     @stack_context('service_event_list_test_stack')
@@ -1089,7 +1082,10 @@ class StackServiceTest(HeatTestCase):
         service.EngineService._get_stack(self.ctx,
                                          self.stack.identifier()).AndReturn(s)
         self.m.StubOutWithMock(instances.Instance, 'metadata_update')
+        self.m.StubOutWithMock(db_api, 'user_creds_get')
         instances.Instance.metadata_update(new_metadata=test_metadata)
+        db_api.user_creds_get(mox.IgnoreArg()).MultipleTimes().AndReturn(
+            self.ctx.to_dict())
         self.m.ReplayAll()
 
         result = self.eng.metadata_update(self.ctx,

diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py
index 0cadb861daf0616c4b9ee469fdba07191aadc529..2d45566b1ee1ffc3362d5494e57593695f9b7181 100644 (file)
--- a/heat/tests/test_event.py
+++ b/heat/tests/test_event.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 
-from heat.common import context
 import heat.db.api as db_api
 from heat.engine import parser
 from heat.engine import resource
@@ -21,6 +20,7 @@ from heat.engine import template
 from heat.engine import event
 
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 from heat.tests import generic_resource as generic_rsrc
 
@@ -42,9 +42,7 @@ class EventTest(HeatTestCase):
         self.username = 'event_test_user'
 
         setup_dummy_db()
-        self.ctx = context.get_admin_context()
-        self.m.StubOutWithMock(self.ctx, 'username')
-        self.ctx.username = self.username
+        self.ctx = dummy_context()
 
         self.m.ReplayAll()
 

diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py
index d04aa9dcddaab51d8d8edb925720ebb37d14fc2d..e895b769c774e48670ecbff396c40b921b66aaa0 100644 (file)
--- a/heat/tests/test_heatclient.py
+++ b/heat/tests/test_heatclient.py
@@ -14,9 +14,9 @@
 
 import mox
 
-from heat.common import context
 from heat.common import heat_keystoneclient
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 
 
 class KeystoneClientTest(HeatTestCase):
@@ -37,20 +37,6 @@ class KeystoneClientTest(HeatTestCase):
         # verify all the things
         self.addCleanup(self.m.VerifyAll)
 
-    def _create_context(self, user='stacks_test_user',
-                        tenant='test_admin', password='test_password',
-                        auth_url="auth_url", tenant_id='tenant_id', ctx=None):
-        """
-        :returns: A test context
-        """
-        ctx = ctx or context.get_admin_context()
-        ctx.auth_url = auth_url
-        ctx.username = user
-        ctx.password = password
-        ctx.tenant_id = tenant_id
-        ctx.tenant = tenant
-        return ctx
-
     def test_username_length(self):
         """Test that user names >64 characters are properly truncated."""
 
@@ -76,5 +62,5 @@ class KeystoneClientTest(HeatTestCase):
         # long_user_name, keystone was actually called with a truncated
         # user name
         heat_ks_client = heat_keystoneclient.KeystoneClient(
-            self._create_context())
+            dummy_context())
         heat_ks_client.create_stack_user(long_user_name, password='password')

diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py
index d639eae3ff24ac9e5c906cba0ab64da6e9b02c91..661927197eeaf09ffaff7014eae98a142f2b08bd 100644 (file)
--- a/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@ -27,6 +27,7 @@ from heat.engine import scheduler
 from heat.openstack.common import uuidutils
 from heat.tests.common import HeatTestCase
 from heat.tests import utils
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 
@@ -65,7 +66,7 @@ class InstancesTest(HeatTestCase):
     def _setup_test_stack(self, stack_name):
         t = template_format.parse(wp_template)
         template = parser.Template(t)
-        stack = parser.Stack(None, stack_name, template,
+        stack = parser.Stack(dummy_context(), stack_name, template,
                              environment.Environment({'KeyName': 'test'}),
                              stack_id=uuidutils.generate_uuid())
         return (t, stack)

diff --git a/heat/tests/test_instance_network.py b/heat/tests/test_instance_network.py
index 9e1bd2a0fb39d8e130669cbc14ccc7830b3016c2..389e9b52fa8c051fc290da2b80ecc488f5f4fa52 100644 (file)
--- a/heat/tests/test_instance_network.py
+++ b/heat/tests/test_instance_network.py
@@ -23,6 +23,7 @@ from heat.engine import scheduler
 from heat.openstack.common import uuidutils
 from heat.tests.common import HeatTestCase
 from heat.tests import utils
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 
@@ -157,7 +158,7 @@ class instancesTest(HeatTestCase):
         kwargs = {'KeyName': 'test',
                   'InstanceType': 'm1.large',
                   'SubnetId': '4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861'}
-        stack = parser.Stack(None, stack_name, template,
+        stack = parser.Stack(dummy_context(), stack_name, template,
                              environment.Environment(kwargs),
                              stack_id=uuidutils.generate_uuid())
 
@@ -198,7 +199,7 @@ class instancesTest(HeatTestCase):
         kwargs = {'KeyName': 'test',
                   'InstanceType': 'm1.large',
                   'SubnetId': '4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861'}
-        stack = parser.Stack(None, stack_name, template,
+        stack = parser.Stack(dummy_context(), stack_name, template,
                              environment.Environment(kwargs),
                              stack_id=uuidutils.generate_uuid())
 

diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py
index 86d56e414ce1a9d4ead2c963d64aaa7869bb3a8f..ae255c564c9b212bf04080d026aa37c7d607f847 100644 (file)
--- a/heat/tests/test_metadata_refresh.py
+++ b/heat/tests/test_metadata_refresh.py
@@ -18,9 +18,11 @@ import mox
 from oslo.config import cfg
 from heat.tests import fakes
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 from heat.tests.utils import stack_delete_after
 
+from heat.db import api as db_api
 from heat.engine import environment
 from heat.common import identifier
 from heat.common import template_format
@@ -28,7 +30,6 @@ from heat.engine import parser
 from heat.engine import scheduler
 from heat.engine import service
 from heat.engine.resources import instance
-from heat.common import context
 from heat.engine.resources import wait_condition as wc
 
 
@@ -142,8 +143,7 @@ class MetadataRefreshTest(HeatTestCase):
     def create_stack(self, stack_name='test_stack', params={}):
         temp = template_format.parse(test_template_metadata)
         template = parser.Template(temp)
-        ctx = context.get_admin_context()
-        ctx.tenant_id = 'test_tenant'
+        ctx = dummy_context()
         stack = parser.Stack(ctx, stack_name, template,
                              environment.Environment(params),
                              disable_rollback=True)
@@ -195,8 +195,6 @@ class WaitCondMetadataUpdateTest(HeatTestCase):
     def setUp(self):
         super(WaitCondMetadataUpdateTest, self).setUp()
         setup_dummy_db()
-        self.ctx = context.get_admin_context()
-        self.ctx.tenant_id = 'test_tenant'
         self.fc = fakes.FakeKeystoneClient()
         self.man = service.EngineService('a-host', 'a-topic')
         cfg.CONF.set_default('heat_waitcondition_server_url',
@@ -207,7 +205,7 @@ class WaitCondMetadataUpdateTest(HeatTestCase):
     def create_stack(self, stack_name='test_stack'):
         temp = template_format.parse(test_template_waitcondition)
         template = parser.Template(temp)
-        stack = parser.Stack(self.ctx, stack_name, template,
+        stack = parser.Stack(dummy_context(), stack_name, template,
                              disable_rollback=True)
 
         self.stack_id = stack.store()
@@ -221,12 +219,13 @@ class WaitCondMetadataUpdateTest(HeatTestCase):
         self.m.StubOutWithMock(wc.WaitConditionHandle, 'keystone')
         wc.WaitConditionHandle.keystone().MultipleTimes().AndReturn(self.fc)
 
-        id = identifier.ResourceIdentifier('test_tenant', stack.name,
+        id = identifier.ResourceIdentifier('test_tenant_id', stack.name,
                                            stack.id, '', 'WH')
         self.m.StubOutWithMock(wc.WaitConditionHandle, 'identifier')
         wc.WaitConditionHandle.identifier().MultipleTimes().AndReturn(id)
 
         self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
+        self.m.StubOutWithMock(db_api, 'user_creds_get')
 
         return stack
 
@@ -250,7 +249,7 @@ class WaitCondMetadataUpdateTest(HeatTestCase):
             self.assertEqual(inst.metadata['test'], None)
 
         def update_metadata(id, data, reason):
-            self.man.metadata_update(self.ctx,
+            self.man.metadata_update(dummy_context(),
                                      dict(self.stack.identifier()),
                                      'WH',
                                      {'Data': data, 'Reason': reason,
@@ -261,6 +260,8 @@ class WaitCondMetadataUpdateTest(HeatTestCase):
 
         scheduler.TaskRunner._sleep(mox.IsA(int)).WithSideEffects(check_empty)
         scheduler.TaskRunner._sleep(mox.IsA(int)).WithSideEffects(post_success)
+        db_api.user_creds_get(mox.IgnoreArg()).MultipleTimes().AndReturn(
+            self.stack.context.to_dict())
         scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
 
         self.m.ReplayAll()

diff --git a/heat/tests/test_nested_stack.py b/heat/tests/test_nested_stack.py
index 9de472be107f2bf3d97c6b57ba9f6126c34bdb39..4c6667e63c2d20300c74c4e4d55a2c8b976089ba 100644 (file)
--- a/heat/tests/test_nested_stack.py
+++ b/heat/tests/test_nested_stack.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 
-from heat.common import context
 from heat.common import exception
 from heat.common import template_format
 from heat.common import urlfetch
@@ -24,6 +23,7 @@ from heat.engine import scheduler
 from heat.tests import generic_resource as generic_rsrc
 from heat.tests import utils
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 
@@ -62,12 +62,7 @@ Outputs:
         return stack
 
     def parse_stack(self, t):
-        ctx = context.RequestContext.from_dict({
-            'tenant': 'test_tenant',
-            'tenant_id': 'aaaa',
-            'username': 'test_username',
-            'password': 'password',
-            'auth_url': 'http://localhost:5000/v2.0'})
+        ctx = dummy_context('test_username', 'aaaa', 'password')
         stack_name = 'test_stack'
         tmpl = parser.Template(t)
         stack = parser.Stack(ctx, stack_name, tmpl)

diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index 0e2f45b00b1abae1d7994a7955cd6a3fa0548ed2..5316be8dc1b1f4a80c22b4f4719e3f268a73c329 100644 (file)
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -16,7 +16,6 @@ import json
 import time
 import uuid
 
-from heat.common import context
 from heat.engine import environment
 from heat.common import exception
 from heat.common import template_format
@@ -28,6 +27,7 @@ from heat.engine import scheduler
 from heat.engine import template
 
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 from heat.tests.v1_1 import fakes
 from heat.tests.utils import stack_delete_after
@@ -121,6 +121,11 @@ mapping_template = template_format.parse('''{
 
 
 class TemplateTest(HeatTestCase):
+
+    def setUp(self):
+        super(TemplateTest, self).setUp()
+        self.ctx = dummy_context()
+
     def test_defaults(self):
         empty = parser.Template({})
         try:
@@ -390,7 +395,7 @@ Mappings:
 
     def test_get_azs_with_stack(self):
         snippet = {"Fn::GetAZs": ""}
-        stack = parser.Stack(None, 'test_stack', parser.Template({}))
+        stack = parser.Stack(self.ctx, 'test_stack', parser.Template({}))
         self.m.StubOutWithMock(clients.OpenStackClients, 'nova')
         fc = fakes.FakeClient()
         clients.OpenStackClients.nova().MultipleTimes().AndReturn(fc)
@@ -468,7 +473,7 @@ Mappings:
         parent_resource.metadata = '{"foo": "bar"}'
         parent_resource.t = {'DeletionPolicy': 'Retain',
                              'UpdatePolicy': '{"foo": "bar"}'}
-        stack = parser.Stack(None, 'test_stack',
+        stack = parser.Stack(self.ctx, 'test_stack',
                              parser.Template({}),
                              parent_resource=parent_resource)
         self.assertEqual(
@@ -483,7 +488,7 @@ Mappings:
 
     def test_resource_facade_invalid_arg(self):
         snippet = {'Fn::ResourceFacade': 'wibble'}
-        stack = parser.Stack(None, 'test_stack', parser.Template({}))
+        stack = parser.Stack(self.ctx, 'test_stack', parser.Template({}))
         self.assertRaises(ValueError,
                           parser.Template.resolve_resource_facade,
                           snippet,
@@ -497,7 +502,7 @@ Mappings:
         parent_resource = DummyClass()
         parent_resource.metadata = '{"foo": "bar"}'
         parent_resource.t = {}
-        stack = parser.Stack(None, 'test_stack',
+        stack = parser.Stack(self.ctx, 'test_stack',
                              parser.Template({}),
                              parent_resource=parent_resource)
         self.assertRaises(KeyError,
@@ -513,10 +518,7 @@ class StackTest(HeatTestCase):
         self.username = 'parser_stack_test_user'
 
         setup_dummy_db()
-        self.ctx = context.get_admin_context()
-        self.m.StubOutWithMock(self.ctx, 'user')
-        self.ctx.user = self.username
-        self.ctx.tenant_id = 'test_tenant'
+        self.ctx = dummy_context()
 
         resource._register_class('GenericResourceType',
                                  generic_rsrc.GenericResource)
@@ -526,12 +528,12 @@ class StackTest(HeatTestCase):
         self.m.ReplayAll()
 
     def test_state_defaults(self):
-        stack = parser.Stack(None, 'test_stack', parser.Template({}))
+        stack = parser.Stack(self.ctx, 'test_stack', parser.Template({}))
         self.assertEqual(stack.state, (None, None))
         self.assertEqual(stack.status_reason, '')
 
     def test_state(self):
-        stack = parser.Stack(None, 'test_stack', parser.Template({}),
+        stack = parser.Stack(self.ctx, 'test_stack', parser.Template({}),
                              action=parser.Stack.CREATE,
                              status=parser.Stack.IN_PROGRESS)
         self.assertEqual(stack.state,
@@ -544,7 +546,7 @@ class StackTest(HeatTestCase):
                          (parser.Stack.DELETE, parser.Stack.COMPLETE))
 
     def test_state_bad(self):
-        stack = parser.Stack(None, 'test_stack', parser.Template({}),
+        stack = parser.Stack(self.ctx, 'test_stack', parser.Template({}),
                              action=parser.Stack.CREATE,
                              status=parser.Stack.IN_PROGRESS)
         self.assertEqual(stack.state,
@@ -555,7 +557,7 @@ class StackTest(HeatTestCase):
                           parser.Stack.CREATE, 'oops', 'test')
 
     def test_status_reason(self):
-        stack = parser.Stack(None, 'test_stack', parser.Template({}),
+        stack = parser.Stack(self.ctx, 'test_stack', parser.Template({}),
                              status_reason='quux')
         self.assertEqual(stack.status_reason, 'quux')
         stack.state_set(parser.Stack.CREATE, parser.Stack.IN_PROGRESS,
@@ -614,7 +616,8 @@ class StackTest(HeatTestCase):
         self.m.ReplayAll()
         self.stack = parser.Stack(self.ctx, 'param_arn_test',
                                   parser.Template({}))
-        exp_prefix = 'arn:openstack:heat::test_tenant:stacks/param_arn_test/'
+        exp_prefix = ('arn:openstack:heat::test_tenant_id'
+                      ':stacks/param_arn_test/')
         self.assertEqual(self.stack.parameters['AWS::StackId'],
                          exp_prefix + 'None')
         self.stack.store()
@@ -1466,7 +1469,7 @@ class StackTest(HeatTestCase):
         self.m.StubOutWithMock(scheduler.DependencyTaskGroup, '__call__')
         self.m.StubOutWithMock(scheduler, 'wallclock')
 
-        stack = parser.Stack(None, 's', parser.Template({}))
+        stack = parser.Stack(self.ctx, 's', parser.Template({}))
 
         def dummy_task():
             while True:
@@ -1489,45 +1492,45 @@ class StackTest(HeatTestCase):
         self.m.VerifyAll()
 
     def test_stack_name_valid(self):
-        stack = parser.Stack(None, 's', parser.Template({}))
-        stack = parser.Stack(None, 'stack123', parser.Template({}))
-        stack = parser.Stack(None, 'test.stack', parser.Template({}))
-        stack = parser.Stack(None, 'test_stack', parser.Template({}))
-        stack = parser.Stack(None, 'TEST', parser.Template({}))
-        stack = parser.Stack(None, 'test-stack', parser.Template({}))
+        stack = parser.Stack(self.ctx, 's', parser.Template({}))
+        stack = parser.Stack(self.ctx, 'stack123', parser.Template({}))
+        stack = parser.Stack(self.ctx, 'test.stack', parser.Template({}))
+        stack = parser.Stack(self.ctx, 'test_stack', parser.Template({}))
+        stack = parser.Stack(self.ctx, 'TEST', parser.Template({}))
+        stack = parser.Stack(self.ctx, 'test-stack', parser.Template({}))
 
     def test_stack_name_invalid(self):
-        self.assertRaises(ValueError, parser.Stack, None, '_foo',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, '_foo',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, '1bad',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, '1bad',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, '.kcats',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, '.kcats',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, 'test stack',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, 'test stack',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, ' teststack',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, ' teststack',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, '^-^',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, '^-^',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, '\"stack\"',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, '\"stack\"',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, '1234',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, '1234',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, 'cat|dog',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, 'cat|dog',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, '$(foo)',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, '$(foo)',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, 'test/stack',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, 'test/stack',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, 'test\stack',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, 'test\stack',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, 'test::stack',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, 'test::stack',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, 'test;stack',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, 'test;stack',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, 'test~stack',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, 'test~stack',
                           parser.Template({}))
-        self.assertRaises(ValueError, parser.Stack, None, '#test',
+        self.assertRaises(ValueError, parser.Stack, self.ctx, '#test',
                           parser.Template({}))
 
     @stack_delete_after

diff --git a/heat/tests/test_provider_template.py b/heat/tests/test_provider_template.py
index c047010c0233b99ff5be27ea1abd0468feb6e765..20ad7f8bd6cbd0af1d214abddc3a845fac22c319 100644 (file)
--- a/heat/tests/test_provider_template.py
+++ b/heat/tests/test_provider_template.py
@@ -22,6 +22,7 @@ from heat.openstack.common import uuidutils
 
 from heat.tests import generic_resource as generic_rsrc
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 
@@ -88,7 +89,8 @@ class ProviderTemplateTest(HeatTestCase):
     def test_to_parameters(self):
         """Tests property conversion to parameter values."""
         setup_dummy_db()
-        stack = parser.Stack(None, 'test_stack', parser.Template({}),
+        stack = parser.Stack(dummy_context(), 'test_stack',
+                             parser.Template({}),
                              stack_id=uuidutils.generate_uuid())
 
         class DummyResource(object):

diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py
index d5ac74c0b8b43aaa526471e47e0620b3cf44834e..294e27ad605cff1c7307925430114a7ab5f67eb8 100644 (file)
--- a/heat/tests/test_resource.py
+++ b/heat/tests/test_resource.py
@@ -15,7 +15,6 @@
 import itertools
 from eventlet.support import greenlets as greenlet
 
-from heat.common import context
 from heat.common import exception
 from heat.engine import parser
 from heat.engine import resource
@@ -25,6 +24,7 @@ import heat.db.api as db_api
 
 from heat.tests import generic_resource as generic_rsrc
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 
@@ -32,7 +32,8 @@ class ResourceTest(HeatTestCase):
     def setUp(self):
         super(ResourceTest, self).setUp()
         setup_dummy_db()
-        self.stack = parser.Stack(None, 'test_stack', parser.Template({}),
+        self.stack = parser.Stack(dummy_context(), 'test_stack',
+                                  parser.Template({}),
                                   stack_id=uuidutils.generate_uuid())
 
         resource._register_class('GenericResourceType',
@@ -149,8 +150,8 @@ class ResourceTest(HeatTestCase):
         tmpl1 = {'Type': 'Foo'}
         tmpl2 = {'Type': 'Foo'}
         tmpl3 = {'Type': 'Bar'}
-        stack2 = parser.Stack(None, 'test_stack', parser.Template({}),
-                              stack_id=-1)
+        stack2 = parser.Stack(dummy_context(), 'test_stack',
+                              parser.Template({}), stack_id=-1)
         res1 = generic_rsrc.GenericResource('test_resource', tmpl1, self.stack)
         res2 = generic_rsrc.GenericResource('test_resource', tmpl2, stack2)
         res3 = generic_rsrc.GenericResource('test_resource2', tmpl3, stack2)
@@ -472,10 +473,8 @@ class MetadataTest(HeatTestCase):
             'Metadata': {'Test': 'Initial metadata'}
         }
         setup_dummy_db()
-        ctx = context.get_admin_context()
-        self.m.StubOutWithMock(ctx, 'username')
-        ctx.username = 'metadata_test_user'
-        self.stack = parser.Stack(ctx, 'test_stack', parser.Template({}))
+        self.stack = parser.Stack(dummy_context(),
+                                  'test_stack', parser.Template({}))
         self.stack.store()
         self.res = generic_rsrc.GenericResource('metadata_resource',
                                                 tmpl, self.stack)

diff --git a/heat/tests/test_rpc_client.py b/heat/tests/test_rpc_client.py
index 41f47e4d2a4b7aaab5802d1725b49f471e4d07f8..ccfd5238e596663c9221742f0c726cc384b732ca 100644 (file)
--- a/heat/tests/test_rpc_client.py
+++ b/heat/tests/test_rpc_client.py
@@ -23,17 +23,17 @@ from oslo.config import cfg
 import stubout
 import testtools
 
-from heat.common import context
 from heat.common import identifier
 from heat.rpc import api as rpc_api
 from heat.rpc import client as rpc_client
 from heat.openstack.common import rpc
+from heat.tests.utils import dummy_context
 
 
 class EngineRpcAPITestCase(testtools.TestCase):
 
     def setUp(self):
-        self.context = context.get_admin_context()
+        self.context = dummy_context()
         cfg.CONF.set_default('rpc_backend',
                              'heat.openstack.common.rpc.impl_fake')
         cfg.CONF.set_default('verbose', True)
@@ -46,7 +46,7 @@ class EngineRpcAPITestCase(testtools.TestCase):
         super(EngineRpcAPITestCase, self).setUp()
 
     def _test_engine_api(self, method, rpc_method, **kwargs):
-        ctxt = context.RequestContext('fake_user', 'fake_project')
+        ctxt = dummy_context()
         if 'rpcapi_class' in kwargs:
             rpcapi_class = kwargs['rpcapi_class']
             del kwargs['rpcapi_class']

diff --git a/heat/tests/test_security_group.py b/heat/tests/test_security_group.py
index 0c85c85534982f75ff04fcb16cb82da40c0f760a..3097405b685dd1021d35065a34695e1bec2d92be 100644 (file)
--- a/heat/tests/test_security_group.py
+++ b/heat/tests/test_security_group.py
@@ -15,11 +15,11 @@
 import collections
 
 from heat.engine import clients
-from heat.common import context
 from heat.common import template_format
 from heat.engine import parser
 from heat.engine import resource
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 from heat.tests.v1_1 import fakes
 from heat.tests import utils
@@ -109,14 +109,9 @@ Resources:
         return self.stack
 
     def parse_stack(self, t):
-        ctx = context.RequestContext.from_dict({
-            'tenant': 'test_tenant',
-            'username': 'test_username',
-            'password': 'password',
-            'auth_url': 'http://localhost:5000/v2.0'})
         stack_name = 'test_stack'
         tmpl = parser.Template(t)
-        stack = parser.Stack(ctx, stack_name, tmpl)
+        stack = parser.Stack(dummy_context(), stack_name, tmpl)
         stack.store()
         return stack
 

diff --git a/heat/tests/test_server_tags.py b/heat/tests/test_server_tags.py
index fd55c39c03b35cf4dd6b640e7efebd09f21b9ab3..ef59889a3cc592726a88f8e54ed1131afc0e9d5b 100644 (file)
--- a/heat/tests/test_server_tags.py
+++ b/heat/tests/test_server_tags.py
@@ -23,6 +23,7 @@ from heat.engine import scheduler
 from heat.openstack.common import uuidutils
 from heat.tests.common import HeatTestCase
 from heat.tests import utils
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 
@@ -96,7 +97,7 @@ class ServerTagsTest(HeatTestCase):
         stack_name = 'tag_test'
         t = template_format.parse(instance_template)
         template = parser.Template(t)
-        stack = parser.Stack(None, stack_name, template,
+        stack = parser.Stack(dummy_context(), stack_name, template,
                              environment.Environment({'KeyName': 'test'}),
                              stack_id=uuidutils.generate_uuid())
 
@@ -138,7 +139,7 @@ class ServerTagsTest(HeatTestCase):
         stack_name = 'tag_test'
         t = template_format.parse(group_template)
         template = parser.Template(t)
-        stack = parser.Stack(None, stack_name, template,
+        stack = parser.Stack(dummy_context(), stack_name, template,
                              environment.Environment({'KeyName': 'test'}),
                              stack_id=uuidutils.generate_uuid())
 

diff --git a/heat/tests/test_sqlalchemy_api.py b/heat/tests/test_sqlalchemy_api.py
index 5782430dafa7c52792ae863604397e8e142b0c85..2ae81e937e0e4c820744a7183871c0be1da93b84 100644 (file)
--- a/heat/tests/test_sqlalchemy_api.py
+++ b/heat/tests/test_sqlalchemy_api.py
@@ -19,6 +19,7 @@ from heat.engine import parser
 from heat.openstack.common import uuidutils
 from heat.tests.common import HeatTestCase
 from heat.tests.utils import setup_dummy_db
+from heat.tests.utils import dummy_context
 
 
 wp_template = '''
@@ -74,7 +75,8 @@ class SqlAlchemyTest(HeatTestCase):
     def _setup_test_stack(self, stack_name):
         t = template_format.parse(wp_template)
         template = parser.Template(t)
-        stack = parser.Stack(None, stack_name, template,
+        ctx = dummy_context()
+        stack = parser.Stack(ctx, stack_name, template,
                              environment.Environment({'KeyName': 'test'}),
                              stack_id=uuidutils.generate_uuid())
         return (t, stack)

diff --git a/heat/tests/test_stack_resource.py b/heat/tests/test_stack_resource.py
index 83e4d954b1663b701a94516a237ea629fa852738..0961d8dbe2986bbd2b5a3e29bf45912f6e8a5924 100644 (file)
--- a/heat/tests/test_stack_resource.py
+++ b/heat/tests/test_stack_resource.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 from heat.common import template_format
-from heat.common import context
 from heat.common import exception
 from heat.engine import environment
 from heat.engine import parser
@@ -24,6 +23,7 @@ from heat.engine import template
 from heat.openstack.common import uuidutils
 from heat.tests.common import HeatTestCase
 from heat.tests import generic_resource as generic_rsrc
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 from heat.tests.utils import stack_delete_after
 
@@ -85,12 +85,11 @@ class StackResourceTest(HeatTestCase):
                                  MyStackResource)
         t = parser.Template({template.RESOURCES:
                              {"provider_resource": ws_res_snippet}})
-        self.parent_stack = parser.Stack(None, 'test_stack', t,
+        self.parent_stack = parser.Stack(dummy_context(), 'test_stack', t,
                                          stack_id=uuidutils.generate_uuid())
         self.parent_resource = MyStackResource('test',
                                                ws_res_snippet,
                                                self.parent_stack)
-        self.parent_resource.context = context.get_admin_context()
         self.templ = template_format.parse(wp_template)
 
     @stack_delete_after

diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py
index 6cadb7fc856472ad041bd04b358bba286c30c288..20a7211a912117f1257ca6449cf5e058bc347341 100644 (file)
--- a/heat/tests/test_validate.py
+++ b/heat/tests/test_validate.py
@@ -17,7 +17,6 @@ from testtools import skipIf
 from heat.engine import clients
 from heat.engine import environment
 from heat.tests.v1_1 import fakes
-from heat.common import context
 from heat.common import exception
 from heat.common import template_format
 from heat.engine import resources
@@ -27,6 +26,7 @@ from heat.openstack.common.importutils import try_import
 import heat.db.api as db_api
 from heat.engine import parser
 from heat.tests.common import HeatTestCase
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 test_template_volumeattach = '''
@@ -493,11 +493,11 @@ class validateTest(HeatTestCase):
         self.fc = fakes.FakeClient()
         resources.initialise()
         setup_dummy_db()
-        self.ctx = context.get_admin_context()
+        self.ctx = dummy_context()
 
     def test_validate_volumeattach_valid(self):
         t = template_format.parse(test_template_volumeattach % 'vdq')
-        stack = parser.Stack(None, 'test_stack', parser.Template(t))
+        stack = parser.Stack(self.ctx, 'test_stack', parser.Template(t))
 
         self.m.StubOutWithMock(db_api, 'resource_get_by_name_and_stack')
         db_api.resource_get_by_name_and_stack(None, 'test_resource_name',
@@ -509,7 +509,7 @@ class validateTest(HeatTestCase):
 
     def test_validate_volumeattach_invalid(self):
         t = template_format.parse(test_template_volumeattach % 'sda')
-        stack = parser.Stack(None, 'test_stack', parser.Template(t))
+        stack = parser.Stack(self.ctx, 'test_stack', parser.Template(t))
 
         self.m.StubOutWithMock(db_api, 'resource_get_by_name_and_stack')
         db_api.resource_get_by_name_and_stack(None, 'test_resource_name',
@@ -637,7 +637,7 @@ class validateTest(HeatTestCase):
         t = template_format.parse(test_unregistered_key)
         template = parser.Template(t)
         params = {'KeyName': 'not_registered'}
-        stack = parser.Stack(None, 'test_stack', template,
+        stack = parser.Stack(self.ctx, 'test_stack', template,
                              environment.Environment(params))
 
         self.m.StubOutWithMock(instances.Instance, 'nova')
@@ -651,7 +651,7 @@ class validateTest(HeatTestCase):
     def test_invalid_security_groups_with_nics(self):
         t = template_format.parse(test_template_invalid_secgroups)
         template = parser.Template(t)
-        stack = parser.Stack(None, 'test_stack', template,
+        stack = parser.Stack(self.ctx, 'test_stack', template,
                              environment.Environment({'KeyName': 'test'}))
 
         self.m.StubOutWithMock(instances.Instance, 'nova')
@@ -664,7 +664,7 @@ class validateTest(HeatTestCase):
     def test_invalid_security_group_ids_with_nics(self):
         t = template_format.parse(test_template_invalid_secgroupids)
         template = parser.Template(t)
-        stack = parser.Stack(None, 'test_stack', template,
+        stack = parser.Stack(self.ctx, 'test_stack', template,
                              environment.Environment({'KeyName': 'test'}))
 
         self.m.StubOutWithMock(instances.Instance, 'nova')

diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py
index 911382424e41029970984163306b6ec7dea2823e..6e8635742647587ba0a876f190b62d050a0f1359 100644 (file)
--- a/heat/tests/test_vpc.py
+++ b/heat/tests/test_vpc.py
@@ -14,13 +14,13 @@
 
 from testtools import skipIf
 
-from heat.common import context
 from heat.common import exception
 from heat.common import template_format
 from heat.engine import parser
 from heat.engine import resource
 from heat.tests.common import HeatTestCase
 from heat.tests import utils
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
 
 try:
@@ -68,14 +68,9 @@ class VPCTestBase(HeatTestCase):
         return stack
 
     def parse_stack(self, t):
-        ctx = context.RequestContext.from_dict({
-            'tenant': 'test_tenant',
-            'username': 'test_username',
-            'password': 'password',
-            'auth_url': 'http://localhost:5000/v2.0'})
         stack_name = 'test_stack'
         tmpl = parser.Template(t)
-        stack = parser.Stack(ctx, stack_name, tmpl)
+        stack = parser.Stack(dummy_context(), stack_name, tmpl)
         stack.store()
         return stack
 

diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py
index 018773affa69a5846bbe254baf2d892b0d3c47fb..a8b9c66ed18d9d57762a7b4f844b85299e155426 100644 (file)
--- a/heat/tests/test_waitcondition.py
+++ b/heat/tests/test_waitcondition.py
@@ -21,8 +21,9 @@ from oslo.config import cfg
 
 from heat.tests.common import HeatTestCase
 from heat.tests import fakes
-from heat.tests.utils import stack_delete_after
+from heat.tests.utils import dummy_context
 from heat.tests.utils import setup_dummy_db
+from heat.tests.utils import stack_delete_after
 
 import heat.db.api as db_api
 from heat.common import template_format
@@ -32,7 +33,6 @@ from heat.engine import parser
 from heat.engine import resource
 from heat.engine import scheduler
 from heat.engine.resources import wait_condition as wc
-from heat.common import context
 
 test_template_waitcondition = '''
 {
@@ -110,8 +110,7 @@ class WaitConditionTest(HeatTestCase):
                      stub=True):
         temp = template_format.parse(template)
         template = parser.Template(temp)
-        ctx = context.get_admin_context()
-        ctx.tenant_id = 'test_tenant'
+        ctx = dummy_context(tenant_id='test_tenant')
         stack = parser.Stack(ctx, stack_name, template,
                              environment.Environment(params),
                              disable_rollback=True)
@@ -381,8 +380,7 @@ class WaitConditionHandleTest(HeatTestCase):
     def create_stack(self, stack_name='test_stack2', params={}):
         temp = template_format.parse(test_template_waitcondition)
         template = parser.Template(temp)
-        ctx = context.get_admin_context()
-        ctx.tenant_id = 'test_tenant'
+        ctx = dummy_context(tenant_id='test_tenant')
         stack = parser.Stack(ctx, stack_name, template,
                              environment.Environment(params),
                              disable_rollback=True)

diff --git a/heat/tests/test_watch.py b/heat/tests/test_watch.py
index d50c2bc118d5eba8d8e74be5a0917b52d20bce38..4ba6e44f6c0c5dc22949a64b84c644c79dd3e0c7 100644 (file)
--- a/heat/tests/test_watch.py
+++ b/heat/tests/test_watch.py
@@ -15,7 +15,6 @@
 
 import datetime
 import mox
-from heat.common import context
 import heat.db.api as db_api
 
 from heat.common import exception
@@ -24,6 +23,7 @@ from heat.engine import watchrule
 from heat.engine import parser
 from heat.tests.common import HeatTestCase
 from heat.tests import utils
+from heat.tests.utils import dummy_context
 
 
 class WatchData:
@@ -47,9 +47,8 @@ class WatchRuleTest(HeatTestCase):
         # Create a dummy stack in the DB as WatchRule instances
         # must be associated with a stack
         utils.setup_dummy_db()
-        ctx = context.get_admin_context()
-        ctx.username = 'dummyuser'
-        ctx.tenant_id = '123456'
+        ctx = dummy_context()
+        ctx.auth_token = 'abcd1234'
         empty_tmpl = {"template": {}}
         tmpl = parser.Template(empty_tmpl)
         stack_name = 'dummystack'
@@ -65,9 +64,8 @@ class WatchRuleTest(HeatTestCase):
         self.setUpDatabase()
         self.username = 'watchrule_test_user'
 
-        self.ctx = context.get_admin_context()
-        self.ctx.username = self.username
-        self.ctx.tenant_id = u'123456'
+        self.ctx = dummy_context()
+        self.ctx.auth_token = 'abcd1234'
 
         self.m.ReplayAll()