From: Liang Chen Date: Thu, 8 Aug 2013 16:41:37 +0000 (+0800) Subject: Remove unnecessary individual import tests.utils.X X-Git-Tag: 2014.1~249^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d53e9139dc0db850147c8b90028381b15a8cd07f;p=openstack-build%2Fheat-build.git Remove unnecessary individual import tests.utils.X Fixes bug #1210183 Change-Id: I530675329a17b10ef684ceec6c51b418726abdb2 --- diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py index 703a6d4b..5ad32815 100644 --- a/heat/tests/test_api_cfn_v1.py +++ b/heat/tests/test_api_cfn_v1.py @@ -26,7 +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 +from heat.tests import utils policy_path = os.path.dirname(os.path.realpath(__file__)) + "/policy/" @@ -42,7 +42,7 @@ class CfnStackControllerTest(HeatTestCase): qs = "&".join(["=".join([k, str(params[k])]) for k in params]) environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': qs} req = Request(environ) - req.context = dummy_context() + req.context = utils.dummy_context() return req # The tests diff --git a/heat/tests/test_api_cloudwatch.py b/heat/tests/test_api_cloudwatch.py index 1b38ff76..ea2647db 100644 --- a/heat/tests/test_api_cloudwatch.py +++ b/heat/tests/test_api_cloudwatch.py @@ -23,7 +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 +from heat.tests import utils class WatchControllerTest(HeatTestCase): @@ -37,7 +37,7 @@ class WatchControllerTest(HeatTestCase): qs = "&".join(["=".join([k, str(params[k])]) for k in params]) environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': qs} req = Request(environ) - req.context = dummy_context() + req.context = utils.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 9acfbd7b..881abd6c 100644 --- a/heat/tests/test_api_openstack_v1.py +++ b/heat/tests/test_api_openstack_v1.py @@ -32,7 +32,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 +from heat.tests import utils import heat.api.middleware.fault as fault @@ -232,7 +232,7 @@ class ControllerTest(object): environ['REQUEST_METHOD'] = method req = Request(environ) - req.context = dummy_context('api_test_user', self.tenant) + req.context = utils.dummy_context('api_test_user', self.tenant) return req def _get(self, path): @@ -247,7 +247,7 @@ class ControllerTest(object): environ['REQUEST_METHOD'] = method req = Request(environ) - req.context = dummy_context('api_test_user', self.tenant) + req.context = utils.dummy_context('api_test_user', self.tenant) req.body = data return req diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py index a3169b54..110e41bf 100644 --- a/heat/tests/test_autoscaling.py +++ b/heat/tests/test_autoscaling.py @@ -31,8 +31,8 @@ from heat.engine.resource import Metadata from heat.openstack.common import timeutils from heat.tests.common import HeatTestCase from heat.tests import fakes -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack +from heat.tests import utils + as_template = ''' { @@ -101,7 +101,7 @@ class AutoScalingTest(HeatTestCase): def setUp(self): super(AutoScalingTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() cfg.CONF.set_default('heat_waitcondition_server_url', 'http://127.0.0.1:8000/v1/waitcondition') self.fc = fakes.FakeKeystoneClient() @@ -173,7 +173,7 @@ class AutoScalingTest(HeatTestCase): properties = t['Resources']['WebServerGroup']['Properties'] properties['MinSize'] = '0' properties['MaxSize'] = '0' - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) now = timeutils.utcnow() self.m.ReplayAll() @@ -188,7 +188,7 @@ class AutoScalingTest(HeatTestCase): properties = t['Resources']['WebServerGroup']['Properties'] properties['MinSize'] = '1' properties['MaxSize'] = '1' - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -217,7 +217,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_update_replace(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -238,7 +238,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_suspend(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -269,7 +269,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_resume(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -306,7 +306,7 @@ class AutoScalingTest(HeatTestCase): t = template_format.parse(as_template) properties = t['Resources']['WebServerGroup']['Properties'] properties['DesiredCapacity'] = '2' - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(2) now = timeutils.utcnow() @@ -342,7 +342,7 @@ class AutoScalingTest(HeatTestCase): t = template_format.parse(as_template) properties = t['Resources']['WebServerGroup']['Properties'] properties['DesiredCapacity'] = '2' - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(2) now = timeutils.utcnow() @@ -380,7 +380,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_suspend_fail(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -412,7 +412,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_resume_fail(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -448,7 +448,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_create_error(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self.m.StubOutWithMock(instance.Instance, 'handle_create') self.m.StubOutWithMock(instance.Instance, 'check_create_complete') @@ -472,7 +472,7 @@ class AutoScalingTest(HeatTestCase): properties = t['Resources']['WebServerGroup']['Properties'] properties['MinSize'] = '1' properties['MaxSize'] = '3' - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -498,7 +498,7 @@ class AutoScalingTest(HeatTestCase): properties = t['Resources']['WebServerGroup']['Properties'] properties['MinSize'] = '1' properties['MaxSize'] = '3' - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -529,7 +529,7 @@ class AutoScalingTest(HeatTestCase): properties = t['Resources']['WebServerGroup']['Properties'] properties['MinSize'] = '1' properties['MaxSize'] = '3' - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -560,7 +560,7 @@ class AutoScalingTest(HeatTestCase): t = template_format.parse(as_template) properties = t['Resources']['WebServerGroup']['Properties'] properties['DesiredCapacity'] = '2' - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(2) now = timeutils.utcnow() @@ -588,7 +588,7 @@ class AutoScalingTest(HeatTestCase): t = template_format.parse(as_template) properties = t['Resources']['WebServerGroup']['Properties'] properties['Cooldown'] = '60' - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) self._stub_lb_reload(1) now = timeutils.utcnow() @@ -630,7 +630,7 @@ class AutoScalingTest(HeatTestCase): self._stub_meta_expected(now, 'ExactCapacity : 1') self._stub_create(1) self.m.ReplayAll() - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) rsrc = self.create_scaling_group(t, stack, 'WebServerGroup') self.assertEqual('WebServerGroup', rsrc.FnGetRefId()) @@ -644,7 +644,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_adjust(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # start with 3 properties = t['Resources']['WebServerGroup']['Properties'] @@ -687,7 +687,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_scale_up_failure(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group self._stub_lb_reload(1) @@ -713,7 +713,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_nochange(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group, 2 instances properties = t['Resources']['WebServerGroup']['Properties'] @@ -747,7 +747,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_percent(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group, 2 instances properties = t['Resources']['WebServerGroup']['Properties'] @@ -784,7 +784,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_cooldown_toosoon(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group, 2 instances, Cooldown 60s properties = t['Resources']['WebServerGroup']['Properties'] @@ -837,7 +837,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_cooldown_ok(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group, 2 instances, Cooldown 60s properties = t['Resources']['WebServerGroup']['Properties'] @@ -890,7 +890,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_group_cooldown_zero(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group, 2 instances, Cooldown 0 properties = t['Resources']['WebServerGroup']['Properties'] @@ -940,7 +940,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_policy_up(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group self._stub_lb_reload(1) @@ -977,7 +977,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_policy_down(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group, 2 instances properties = t['Resources']['WebServerGroup']['Properties'] @@ -1011,7 +1011,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_policy_cooldown_toosoon(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group self._stub_lb_reload(1) @@ -1067,7 +1067,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_policy_cooldown_ok(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group self._stub_lb_reload(1) @@ -1123,7 +1123,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_policy_cooldown_zero(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group self._stub_lb_reload(1) @@ -1179,7 +1179,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_policy_cooldown_none(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group self._stub_lb_reload(1) @@ -1237,7 +1237,7 @@ class AutoScalingTest(HeatTestCase): def test_scaling_policy_update(self): t = template_format.parse(as_template) - stack = parse_stack(t, params=self.params) + stack = utils.parse_stack(t, params=self.params) # Create initial group self._stub_lb_reload(1) diff --git a/heat/tests/test_clouddatabase.py b/heat/tests/test_clouddatabase.py index 8db5bf57..48218914 100644 --- a/heat/tests/test_clouddatabase.py +++ b/heat/tests/test_clouddatabase.py @@ -21,8 +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 +from heat.tests import utils wp_template = ''' @@ -74,7 +73,7 @@ class FakeDBInstance(object): class CloudDBInstanceTest(HeatTestCase): def setUp(self): super(CloudDBInstanceTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() # Test environment may not have pyrax client library installed and if # pyrax is not installed resource class would not be registered. # So register resource provider class explicitly for unit testing. @@ -85,7 +84,7 @@ class CloudDBInstanceTest(HeatTestCase): stack_name = '%s_stack' % name t = template_format.parse(wp_template) template = parser.Template(t) - stack = parser.Stack(dummy_context(), + stack = parser.Stack(utils.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 45910b10..4452531f 100644 --- a/heat/tests/test_common_policy.py +++ b/heat/tests/test_common_policy.py @@ -20,7 +20,7 @@ from oslo.config import cfg from heat.common import policy from heat.common import exception from heat.tests.common import HeatTestCase -from heat.tests.utils import dummy_context +from heat.tests import utils 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 = dummy_context(roles=[]) + ctx = utils.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 = dummy_context(roles=[]) + ctx = utils.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 = dummy_context(roles=['heat_stack_user']) + ctx = utils.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 = dummy_context(roles=['not_a_stack_user']) + ctx = utils.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 = dummy_context(roles=['heat_stack_user']) + ctx = utils.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 = dummy_context(roles=['not_a_stack_user']) + ctx = utils.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_dbinstance.py b/heat/tests/test_dbinstance.py index d75621c7..fb88aa80 100644 --- a/heat/tests/test_dbinstance.py +++ b/heat/tests/test_dbinstance.py @@ -20,8 +20,7 @@ from heat.common import template_format from heat.engine import scheduler from heat.engine.resources import dbinstance as dbi from heat.tests.common import HeatTestCase -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack +from heat.tests import utils rds_template = ''' @@ -56,7 +55,7 @@ rds_template = ''' class DBInstanceTest(HeatTestCase): def setUp(self): super(DBInstanceTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() self.m.StubOutWithMock(dbi.DBInstance, 'create_with_template') self.m.StubOutWithMock(dbi.DBInstance, 'check_create_complete') self.m.StubOutWithMock(dbi.DBInstance, 'nested') @@ -99,7 +98,7 @@ class DBInstanceTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(rds_template) - s = parse_stack(t) + s = utils.parse_stack(t) resource = self.create_dbinstance(t, s, 'DatabaseServer') self.assertEqual('0.0.0.0', resource.FnGetAtt('Endpoint.Address')) diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py index 7715877b..4e17eccf 100644 --- a/heat/tests/test_eip.py +++ b/heat/tests/test_eip.py @@ -20,8 +20,7 @@ from heat.engine import resource from heat.engine import scheduler from heat.tests.common import HeatTestCase from heat.tests.v1_1 import fakes -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack +from heat.tests import utils eip_template = ''' @@ -74,7 +73,7 @@ class EIPTest(HeatTestCase): self.m.StubOutWithMock(eip.ElasticIp, 'nova') self.m.StubOutWithMock(eip.ElasticIpAssociation, 'nova') self.m.StubOutWithMock(self.fc.servers, 'get') - setup_dummy_db() + utils.setup_dummy_db() def create_eip(self, t, stack, resource_name): rsrc = eip.ElasticIp(resource_name, @@ -103,7 +102,7 @@ class EIPTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(eip_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_eip(t, stack, 'IPAddress') @@ -136,7 +135,7 @@ class EIPTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(eip_template_ipassoc) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_eip(t, stack, 'IPAddress') association = self.create_association(t, stack, 'IPAssoc') diff --git a/heat/tests/test_engine_api_utils.py b/heat/tests/test_engine_api_utils.py index 517e5cfb..0ccf8c87 100644 --- a/heat/tests/test_engine_api_utils.py +++ b/heat/tests/test_engine_api_utils.py @@ -19,8 +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 +from heat.tests import utils class EngineApiTest(HeatTestCase): @@ -83,7 +82,7 @@ class FormatTest(HeatTestCase): def setUp(self): super(FormatTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() template = parser.Template({ 'Resources': { @@ -95,8 +94,8 @@ class FormatTest(HeatTestCase): }) resource._register_class('GenericResourceType', generic_rsrc.GenericResource) - self.stack = parser.Stack(dummy_context(), 'test_stack', template, - stack_id=uuidutils.generate_uuid()) + self.stack = parser.Stack(utils.dummy_context(), 'test_stack', + template, stack_id=uuidutils.generate_uuid()) def test_format_stack_resource(self): res = self.stack['generic1'] diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index 5c41c8d0..bb76568a 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -39,8 +39,6 @@ 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 wp_template = ''' @@ -112,7 +110,7 @@ policy_template = ''' def create_context(mocks, user='stacks_test_user', tenant_id='test_admin', password='stacks_test_password'): - ctx = dummy_context() + ctx = utils.dummy_context() mocks.StubOutWithMock(ctx, 'username') mocks.StubOutWithMock(ctx, 'tenant_id') mocks.StubOutWithMock(ctx, 'password') @@ -239,7 +237,7 @@ class DummyThreadGroup(object): class StackCreateTest(HeatTestCase): def setUp(self): super(StackCreateTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() def test_wordpress_single_instance_stack_create(self): stack = get_wordpress_stack('test_stack', create_context(self.m)) @@ -284,7 +282,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase): def setUp(self): super(StackServiceCreateUpdateDeleteTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() self.ctx = create_context(self.m) self.man = service.EngineService('a-host', 'a-topic') @@ -586,7 +584,7 @@ class StackServiceSuspendResumeTest(HeatTestCase): def setUp(self): super(StackServiceSuspendResumeTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() self.ctx = create_context(self.m) self.man = service.EngineService('a-host', 'a-topic') @@ -658,7 +656,7 @@ class StackServiceTest(HeatTestCase): self.eng = service.EngineService('a-host', 'a-topic') cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role') - setup_dummy_db() + utils.setup_dummy_db() @stack_context('service_identify_test_stack', False) def test_stack_identify(self): diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py index 2d45566b..fd326528 100644 --- a/heat/tests/test_event.py +++ b/heat/tests/test_event.py @@ -20,9 +20,8 @@ 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 +from heat.tests import utils tmpl = { @@ -41,8 +40,8 @@ class EventTest(HeatTestCase): super(EventTest, self).setUp() self.username = 'event_test_user' - setup_dummy_db() - self.ctx = dummy_context() + utils.setup_dummy_db() + self.ctx = utils.dummy_context() self.m.ReplayAll() diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py index e895b769..fb655a6b 100644 --- a/heat/tests/test_heatclient.py +++ b/heat/tests/test_heatclient.py @@ -16,7 +16,7 @@ import mox from heat.common import heat_keystoneclient from heat.tests.common import HeatTestCase -from heat.tests.utils import dummy_context +from heat.tests import utils class KeystoneClientTest(HeatTestCase): @@ -62,5 +62,5 @@ class KeystoneClientTest(HeatTestCase): # long_user_name, keystone was actually called with a truncated # user name heat_ks_client = heat_keystoneclient.KeystoneClient( - dummy_context()) + utils.dummy_context()) heat_ks_client.create_stack_user(long_user_name, password='password') diff --git a/heat/tests/test_hot.py b/heat/tests/test_hot.py index f7f759e1..e48d334a 100644 --- a/heat/tests/test_hot.py +++ b/heat/tests/test_hot.py @@ -19,7 +19,7 @@ from heat.engine import template from heat.tests.common import HeatTestCase from heat.tests import test_parser -from heat.tests.utils import stack_delete_after +from heat.tests import utils hot_tpl_empty = template_format.parse(''' @@ -262,7 +262,7 @@ class HOTemplateTest(HeatTestCase): class StackTest(test_parser.StackTest): """Test stack function when stack was created from HOT template.""" - @stack_delete_after + @utils.stack_delete_after def test_get_attr(self): """Test resolution of get_attr occurrences in HOT template.""" diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py index 78ad4614..dc525513 100644 --- a/heat/tests/test_instance.py +++ b/heat/tests/test_instance.py @@ -28,8 +28,6 @@ from heat.engine.resources import nova_utils 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 wp_template = ''' @@ -62,12 +60,12 @@ class InstancesTest(HeatTestCase): def setUp(self): super(InstancesTest, self).setUp() self.fc = fakes.FakeClient() - setup_dummy_db() + utils.setup_dummy_db() def _setup_test_stack(self, stack_name): t = template_format.parse(wp_template) template = parser.Template(t) - stack = parser.Stack(dummy_context(), stack_name, template, + stack = parser.Stack(utils.dummy_context(), stack_name, template, environment.Environment({'KeyName': 'test'}), stack_id=uuidutils.generate_uuid()) return (t, stack) diff --git a/heat/tests/test_instance_group.py b/heat/tests/test_instance_group.py index 23c0cfc6..37109fa9 100644 --- a/heat/tests/test_instance_group.py +++ b/heat/tests/test_instance_group.py @@ -22,8 +22,7 @@ from heat.engine import resource from heat.engine import resources from heat.engine import scheduler from heat.tests.common import HeatTestCase -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack +from heat.tests import utils ig_template = ''' @@ -59,7 +58,7 @@ ig_template = ''' class InstanceGroupTest(HeatTestCase): def setUp(self): super(InstanceGroupTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() def _stub_create(self, num, instance_class=instance.Instance): """ @@ -90,7 +89,7 @@ class InstanceGroupTest(HeatTestCase): def test_instance_group(self): t = template_format.parse(ig_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) # start with min then delete self._stub_create(1) @@ -126,7 +125,7 @@ class InstanceGroupTest(HeatTestCase): original_instance) t = template_format.parse(ig_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) self._stub_create(1, instance_class=MyInstance) self.m.ReplayAll() @@ -139,7 +138,7 @@ class InstanceGroupTest(HeatTestCase): def test_missing_image(self): t = template_format.parse(ig_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = asc.InstanceGroup('JobServerGroup', t['Resources']['JobServerGroup'], @@ -161,7 +160,7 @@ class InstanceGroupTest(HeatTestCase): t = template_format.parse(ig_template) properties = t['Resources']['JobServerGroup']['Properties'] properties['Size'] = '2' - stack = parse_stack(t) + stack = utils.parse_stack(t) self._stub_create(2) self.m.ReplayAll() @@ -197,7 +196,7 @@ class InstanceGroupTest(HeatTestCase): t = template_format.parse(ig_template) properties = t['Resources']['JobServerGroup']['Properties'] properties['Size'] = '2' - stack = parse_stack(t) + stack = utils.parse_stack(t) self._stub_create(2) self.m.ReplayAll() @@ -217,7 +216,7 @@ class InstanceGroupTest(HeatTestCase): t = template_format.parse(ig_template) properties = t['Resources']['JobServerGroup']['Properties'] properties['Size'] = '2' - stack = parse_stack(t) + stack = utils.parse_stack(t) self._stub_create(2) self.m.ReplayAll() diff --git a/heat/tests/test_instance_network.py b/heat/tests/test_instance_network.py index 41457eaf..b0f681cb 100644 --- a/heat/tests/test_instance_network.py +++ b/heat/tests/test_instance_network.py @@ -24,8 +24,6 @@ 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 wp_template = ''' @@ -150,7 +148,7 @@ class instancesTest(HeatTestCase): def setUp(self): super(instancesTest, self).setUp() self.fc = fakes.FakeClient() - setup_dummy_db() + utils.setup_dummy_db() def _create_test_instance(self, return_server, name): stack_name = '%s_stack' % name @@ -159,7 +157,7 @@ class instancesTest(HeatTestCase): kwargs = {'KeyName': 'test', 'InstanceType': 'm1.large', 'SubnetId': '4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861'} - stack = parser.Stack(dummy_context(), stack_name, template, + stack = parser.Stack(utils.dummy_context(), stack_name, template, environment.Environment(kwargs), stack_id=uuidutils.generate_uuid()) @@ -201,7 +199,7 @@ class instancesTest(HeatTestCase): kwargs = {'KeyName': 'test', 'InstanceType': 'm1.large', 'SubnetId': '4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861'} - stack = parser.Stack(dummy_context(), stack_name, template, + stack = parser.Stack(utils.dummy_context(), stack_name, template, environment.Environment(kwargs), stack_id=uuidutils.generate_uuid()) diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py index 7c0a4eb7..fdd8232c 100644 --- a/heat/tests/test_loadbalancer.py +++ b/heat/tests/test_loadbalancer.py @@ -28,8 +28,6 @@ from heat.engine.resources import wait_condition as wc from heat.engine.resource import Metadata from heat.tests.common import HeatTestCase from heat.tests import utils -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack from heat.tests.v1_1 import fakes from heat.tests import fakes as test_fakes @@ -113,7 +111,7 @@ class LoadBalancerTest(HeatTestCase): cfg.CONF.set_default('heat_waitcondition_server_url', 'http://127.0.0.1:8000/v1/waitcondition') - setup_dummy_db() + utils.setup_dummy_db() def create_loadbalancer(self, t, stack, resource_name): rsrc = lb.LoadBalancer(resource_name, @@ -158,7 +156,7 @@ class LoadBalancerTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(lb_template) - s = parse_stack(t) + s = utils.parse_stack(t) s.store() rsrc = self.create_loadbalancer(t, s, 'LoadBalancer') @@ -214,7 +212,7 @@ class LoadBalancerTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(lb_template_nokey) - s = parse_stack(t) + s = utils.parse_stack(t) s.store() rsrc = self.create_loadbalancer(t, s, 'LoadBalancer') diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py index ae255c56..4ab21398 100644 --- a/heat/tests/test_metadata_refresh.py +++ b/heat/tests/test_metadata_refresh.py @@ -18,9 +18,7 @@ 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.tests import utils from heat.db import api as db_api from heat.engine import environment @@ -136,14 +134,14 @@ class MetadataRefreshTest(HeatTestCase): def setUp(self): super(MetadataRefreshTest, self).setUp() self.fc = fakes.FakeKeystoneClient() - setup_dummy_db() + utils.setup_dummy_db() # Note tests creating a stack should be decorated with @stack_delete_after # to ensure the stack is properly cleaned up def create_stack(self, stack_name='test_stack', params={}): temp = template_format.parse(test_template_metadata) template = parser.Template(temp) - ctx = dummy_context() + ctx = utils.dummy_context() stack = parser.Stack(ctx, stack_name, template, environment.Environment(params), disable_rollback=True) @@ -160,7 +158,7 @@ class MetadataRefreshTest(HeatTestCase): return stack - @stack_delete_after + @utils.stack_delete_after def test_FnGetAtt(self): self.stack = self.create_stack() @@ -194,7 +192,7 @@ class MetadataRefreshTest(HeatTestCase): class WaitCondMetadataUpdateTest(HeatTestCase): def setUp(self): super(WaitCondMetadataUpdateTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() self.fc = fakes.FakeKeystoneClient() self.man = service.EngineService('a-host', 'a-topic') cfg.CONF.set_default('heat_waitcondition_server_url', @@ -205,7 +203,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(dummy_context(), stack_name, template, + stack = parser.Stack(utils.dummy_context(), stack_name, template, disable_rollback=True) self.stack_id = stack.store() @@ -229,7 +227,7 @@ class WaitCondMetadataUpdateTest(HeatTestCase): return stack - @stack_delete_after + @utils.stack_delete_after def test_wait_meta(self): ''' 1 create stack @@ -249,7 +247,7 @@ class WaitCondMetadataUpdateTest(HeatTestCase): self.assertEqual(inst.metadata['test'], None) def update_metadata(id, data, reason): - self.man.metadata_update(dummy_context(), + self.man.metadata_update(utils.dummy_context(), dict(self.stack.identifier()), 'WH', {'Data': data, 'Reason': reason, diff --git a/heat/tests/test_nested_stack.py b/heat/tests/test_nested_stack.py index 5b7f2f8c..3346ca2b 100644 --- a/heat/tests/test_nested_stack.py +++ b/heat/tests/test_nested_stack.py @@ -23,8 +23,6 @@ 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 class NestedStackTest(HeatTestCase): @@ -52,7 +50,7 @@ Outputs: def setUp(self): super(NestedStackTest, self).setUp() self.m.StubOutWithMock(urlfetch, 'get') - setup_dummy_db() + utils.setup_dummy_db() def create_stack(self, template): t = template_format.parse(template) @@ -62,7 +60,7 @@ Outputs: return stack def parse_stack(self, t): - ctx = dummy_context('test_username', 'aaaa', 'password') + ctx = utils.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_neutron.py b/heat/tests/test_neutron.py index d25ad237..59500d75 100644 --- a/heat/tests/test_neutron.py +++ b/heat/tests/test_neutron.py @@ -29,8 +29,6 @@ from heat.openstack.common.importutils import try_import from heat.tests.common import HeatTestCase from heat.tests import fakes from heat.tests import utils -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack neutronclient = try_import('neutronclient.v2_0.client') qe = try_import('neutronclient.common.exceptions') @@ -214,7 +212,7 @@ class NeutronNetTest(HeatTestCase): self.m.StubOutWithMock(neutronclient.Client, 'delete_network') self.m.StubOutWithMock(neutronclient.Client, 'show_network') self.m.StubOutWithMock(clients.OpenStackClients, 'keystone') - setup_dummy_db() + utils.setup_dummy_db() def create_net(self, t, stack, resource_name): rsrc = net.Net('test_net', t['Resources'][resource_name], stack) @@ -303,7 +301,7 @@ class NeutronNetTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(neutron_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_net(t, stack, 'network') # assert the implicit dependency between the gateway and the interface @@ -348,7 +346,7 @@ class NeutronSubnetTest(HeatTestCase): self.m.StubOutWithMock(neutronclient.Client, 'delete_subnet') self.m.StubOutWithMock(neutronclient.Client, 'show_subnet') self.m.StubOutWithMock(clients.OpenStackClients, 'keystone') - setup_dummy_db() + utils.setup_dummy_db() def create_subnet(self, t, stack, resource_name): rsrc = subnet.Subnet('test_subnet', t['Resources'][resource_name], @@ -425,7 +423,7 @@ class NeutronSubnetTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(neutron_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_subnet(t, stack, 'subnet') rsrc.validate() @@ -512,7 +510,7 @@ class NeutronSubnetTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(neutron_template) t['Resources']['subnet']['Properties']['enable_dhcp'] = 'False' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_subnet(t, stack, 'subnet') rsrc.validate() @@ -536,7 +534,7 @@ class NeutronRouterTest(HeatTestCase): self.m.StubOutWithMock(neutronclient.Client, 'add_gateway_router') self.m.StubOutWithMock(neutronclient.Client, 'remove_gateway_router') self.m.StubOutWithMock(clients.OpenStackClients, 'keystone') - setup_dummy_db() + utils.setup_dummy_db() def create_router(self, t, stack, resource_name): rsrc = router.Router('router', t['Resources'][resource_name], stack) @@ -649,7 +647,7 @@ class NeutronRouterTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(neutron_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_router(t, stack, 'router') rsrc.validate() @@ -688,7 +686,7 @@ class NeutronRouterTest(HeatTestCase): ).AndRaise(qe.NeutronClientException(status_code=404)) self.m.ReplayAll() t = template_format.parse(neutron_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_router_interface( t, stack, 'router_interface', properties={ @@ -716,7 +714,7 @@ class NeutronRouterTest(HeatTestCase): ).AndRaise(qe.NeutronClientException(status_code=404)) self.m.ReplayAll() t = template_format.parse(neutron_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_gateway_router( t, stack, 'gateway', properties={ @@ -743,7 +741,7 @@ class NeutronFloatingIPTest(HeatTestCase): self.m.StubOutWithMock(neutronclient.Client, 'delete_port') self.m.StubOutWithMock(neutronclient.Client, 'show_port') self.m.StubOutWithMock(clients.OpenStackClients, 'keystone') - setup_dummy_db() + utils.setup_dummy_db() def test_floating_ip(self): @@ -774,7 +772,7 @@ class NeutronFloatingIPTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(neutron_floating_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) # assert the implicit dependency between the floating_ip # and the gateway @@ -847,7 +845,7 @@ class NeutronFloatingIPTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(neutron_floating_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) p = stack['port_floating'] scheduler.TaskRunner(p.create)() @@ -946,7 +944,7 @@ class NeutronFloatingIPTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(neutron_floating_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) fip = stack['floating_ip'] scheduler.TaskRunner(fip.create)() diff --git a/heat/tests/test_nokey.py b/heat/tests/test_nokey.py index 6b7e9b92..790e5075 100644 --- a/heat/tests/test_nokey.py +++ b/heat/tests/test_nokey.py @@ -19,8 +19,6 @@ from heat.common import template_format from heat.engine import scheduler from heat.tests.common import HeatTestCase from heat.tests import utils -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack nokey_template = ''' @@ -46,13 +44,13 @@ class nokeyTest(HeatTestCase): def setUp(self): super(nokeyTest, self).setUp() self.fc = fakes.FakeClient() - setup_dummy_db() + utils.setup_dummy_db() def test_nokey_create(self): stack_name = 'instance_create_test_nokey_stack' t = template_format.parse(nokey_template) - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) t['Resources']['WebServer']['Properties']['ImageId'] = 'CentOS 5.2' t['Resources']['WebServer']['Properties']['InstanceType'] = \ diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py index fa771bd9..5ebee5a2 100644 --- a/heat/tests/test_parser.py +++ b/heat/tests/test_parser.py @@ -27,10 +27,8 @@ from heat.engine import template from heat.tests.fakes import FakeKeystoneClient 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 utils from heat.tests.v1_1 import fakes -from heat.tests.utils import stack_delete_after from heat.tests import generic_resource as generic_rsrc import heat.db.api as db_api @@ -124,7 +122,7 @@ class TemplateTest(HeatTestCase): def setUp(self): super(TemplateTest, self).setUp() - self.ctx = dummy_context() + self.ctx = utils.dummy_context() def test_defaults(self): empty = parser.Template({}) @@ -518,8 +516,8 @@ class StackTest(HeatTestCase): self.username = 'parser_stack_test_user' - setup_dummy_db() - self.ctx = dummy_context() + utils.setup_dummy_db() + self.ctx = utils.dummy_context() resource._register_class('GenericResourceType', generic_rsrc.GenericResource) @@ -534,7 +532,7 @@ class StackTest(HeatTestCase): self.assertEqual(stack.status_reason, '') def test_no_auth_token(self): - ctx = dummy_context() + ctx = utils.dummy_context() ctx.auth_token = None self.m.StubOutWithMock(clients.OpenStackClients, 'keystone') clients.OpenStackClients.keystone().AndReturn(FakeKeystoneClient()) @@ -581,7 +579,7 @@ class StackTest(HeatTestCase): self.assertRaises(exception.NotFound, parser.Stack.load, None, -1) - @stack_delete_after + @utils.stack_delete_after def test_load_parent_resource(self): self.stack = parser.Stack(self.ctx, 'load_parent_resource', parser.Template({})) @@ -610,7 +608,7 @@ class StackTest(HeatTestCase): # Note tests creating a stack should be decorated with @stack_delete_after # to ensure the self.stack is properly cleaned up - @stack_delete_after + @utils.stack_delete_after def test_identifier(self): self.stack = parser.Stack(self.ctx, 'identifier_test', parser.Template({})) @@ -621,7 +619,7 @@ class StackTest(HeatTestCase): self.assertTrue(identifier.stack_id) self.assertFalse(identifier.path) - @stack_delete_after + @utils.stack_delete_after def test_set_param_id(self): self.stack = parser.Stack(self.ctx, 'param_arn_test', parser.Template({})) @@ -637,7 +635,7 @@ class StackTest(HeatTestCase): identifier.arn()) self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_load_param_id(self): self.stack = parser.Stack(self.ctx, 'param_load_arn_test', parser.Template({})) @@ -649,7 +647,7 @@ class StackTest(HeatTestCase): newstack = parser.Stack.load(self.ctx, stack_id=self.stack.id) self.assertEqual(newstack.parameters['AWS::StackId'], identifier.arn()) - @stack_delete_after + @utils.stack_delete_after def test_created_time(self): self.stack = parser.Stack(self.ctx, 'creation_time_test', parser.Template({})) @@ -657,7 +655,7 @@ class StackTest(HeatTestCase): self.stack.store() self.assertNotEqual(self.stack.created_time, None) - @stack_delete_after + @utils.stack_delete_after def test_updated_time(self): self.stack = parser.Stack(self.ctx, 'update_time_test', parser.Template({})) @@ -668,7 +666,7 @@ class StackTest(HeatTestCase): self.assertNotEqual(self.stack.updated_time, None) self.assertNotEqual(self.stack.updated_time, stored_time) - @stack_delete_after + @utils.stack_delete_after def test_delete(self): self.stack = parser.Stack(self.ctx, 'delete_test', parser.Template({})) @@ -684,7 +682,7 @@ class StackTest(HeatTestCase): self.assertEqual(self.stack.state, (parser.Stack.DELETE, parser.Stack.COMPLETE)) - @stack_delete_after + @utils.stack_delete_after def test_suspend_resume(self): self.m.ReplayAll() tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}} @@ -707,7 +705,7 @@ class StackTest(HeatTestCase): self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_suspend_fail(self): tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}} self.m.StubOutWithMock(generic_rsrc.GenericResource, 'handle_suspend') @@ -731,7 +729,7 @@ class StackTest(HeatTestCase): 'Resource suspend failed: Exception: foo') self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_resume_fail(self): tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}} self.m.StubOutWithMock(generic_rsrc.GenericResource, 'handle_resume') @@ -759,7 +757,7 @@ class StackTest(HeatTestCase): 'Resource resume failed: Exception: foo') self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_suspend_timeout(self): tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}} self.m.StubOutWithMock(generic_rsrc.GenericResource, 'handle_suspend') @@ -782,7 +780,7 @@ class StackTest(HeatTestCase): self.assertEqual(self.stack.status_reason, 'Suspend timed out') self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_resume_timeout(self): tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}} self.m.StubOutWithMock(generic_rsrc.GenericResource, 'handle_resume') @@ -811,7 +809,7 @@ class StackTest(HeatTestCase): self.assertEqual(self.stack.status_reason, 'Resume timed out') self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_delete_rollback(self): self.stack = parser.Stack(self.ctx, 'delete_rollback_test', parser.Template({}), disable_rollback=False) @@ -827,7 +825,7 @@ class StackTest(HeatTestCase): self.assertEqual(self.stack.state, (parser.Stack.ROLLBACK, parser.Stack.COMPLETE)) - @stack_delete_after + @utils.stack_delete_after def test_delete_badaction(self): self.stack = parser.Stack(self.ctx, 'delete_badaction_test', parser.Template({})) @@ -843,7 +841,7 @@ class StackTest(HeatTestCase): self.assertEqual(self.stack.state, (parser.Stack.DELETE, parser.Stack.FAILED)) - @stack_delete_after + @utils.stack_delete_after def test_update_badstate(self): self.stack = parser.Stack(self.ctx, 'test_stack', parser.Template({}), action=parser.Stack.CREATE, @@ -855,7 +853,7 @@ class StackTest(HeatTestCase): self.assertEqual(self.stack.state, (parser.Stack.UPDATE, parser.Stack.FAILED)) - @stack_delete_after + @utils.stack_delete_after def test_resource_by_refid(self): tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}} @@ -878,7 +876,7 @@ class StackTest(HeatTestCase): finally: rsrc.state_set(rsrc.CREATE, rsrc.COMPLETE) - @stack_delete_after + @utils.stack_delete_after def test_update_add(self): tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}} @@ -899,7 +897,7 @@ class StackTest(HeatTestCase): (parser.Stack.UPDATE, parser.Stack.COMPLETE)) self.assertTrue('BResource' in self.stack) - @stack_delete_after + @utils.stack_delete_after def test_update_remove(self): tmpl = {'Resources': { 'AResource': {'Type': 'GenericResourceType'}, @@ -921,7 +919,7 @@ class StackTest(HeatTestCase): (parser.Stack.UPDATE, parser.Stack.COMPLETE)) self.assertFalse('BResource' in self.stack) - @stack_delete_after + @utils.stack_delete_after def test_update_description(self): tmpl = {'Description': 'ATemplate', 'Resources': {'AResource': {'Type': 'GenericResourceType'}}} @@ -943,7 +941,7 @@ class StackTest(HeatTestCase): (parser.Stack.UPDATE, parser.Stack.COMPLETE)) self.assertEqual(self.stack.t[template.DESCRIPTION], 'BTemplate') - @stack_delete_after + @utils.stack_delete_after def test_update_modify_ok_replace(self): tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType', 'Properties': {'Foo': 'abc'}}}} @@ -972,7 +970,7 @@ class StackTest(HeatTestCase): self.assertEqual(self.stack['AResource'].properties['Foo'], 'xyz') self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_modify_update_failed(self): tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType', 'Properties': {'Foo': 'abc'}}}} @@ -1009,7 +1007,7 @@ class StackTest(HeatTestCase): (parser.Stack.UPDATE, parser.Stack.FAILED)) self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_modify_replace_failed_delete(self): tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType', 'Properties': {'Foo': 'abc'}}}} @@ -1044,7 +1042,7 @@ class StackTest(HeatTestCase): # Unset here so destroy() is not stubbed for stack.delete cleanup self.m.UnsetStubs() - @stack_delete_after + @utils.stack_delete_after def test_update_modify_replace_failed_create(self): tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType', 'Properties': {'Foo': 'abc'}}}} @@ -1077,7 +1075,7 @@ class StackTest(HeatTestCase): (parser.Stack.UPDATE, parser.Stack.FAILED)) self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_add_failed_create(self): tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}} @@ -1110,7 +1108,7 @@ class StackTest(HeatTestCase): self.assertTrue('BResource' in re_stack) self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_rollback(self): tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType', 'Properties': {'Foo': 'abc'}}}} @@ -1146,7 +1144,7 @@ class StackTest(HeatTestCase): self.assertEqual(self.stack['AResource'].properties['Foo'], 'abc') self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_rollback_fail(self): tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType', 'Properties': {'Foo': 'abc'}}}} @@ -1181,7 +1179,7 @@ class StackTest(HeatTestCase): (parser.Stack.ROLLBACK, parser.Stack.FAILED)) self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_rollback_add(self): tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}} @@ -1212,7 +1210,7 @@ class StackTest(HeatTestCase): self.assertFalse('BResource' in self.stack) self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_rollback_remove(self): tmpl = {'Resources': { 'AResource': {'Type': 'GenericResourceType'}, @@ -1244,7 +1242,7 @@ class StackTest(HeatTestCase): # Unset here so delete() is not stubbed for stack.delete cleanup self.m.UnsetStubs() - @stack_delete_after + @utils.stack_delete_after def test_update_replace_by_reference(self): ''' assertion: @@ -1298,7 +1296,7 @@ class StackTest(HeatTestCase): self.assertEqual(self.stack['BResource'].properties['Foo'], 'inst-007') self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_by_reference_and_rollback_1(self): ''' assertion: @@ -1363,7 +1361,7 @@ class StackTest(HeatTestCase): self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_by_reference_and_rollback_2(self): ''' assertion: @@ -1439,7 +1437,7 @@ class StackTest(HeatTestCase): self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_update_replace_parameters(self): ''' assertion: @@ -1539,7 +1537,7 @@ class StackTest(HeatTestCase): self.assertRaises(ValueError, parser.Stack, self.ctx, '#test', parser.Template({})) - @stack_delete_after + @utils.stack_delete_after def test_resource_state_get_att(self): tmpl = { 'Resources': {'AResource': {'Type': 'GenericResourceType'}}, @@ -1575,7 +1573,7 @@ class StackTest(HeatTestCase): rsrc.state_set(action, status) self.assertEqual(None, self.stack.output('TestOutput')) - @stack_delete_after + @utils.stack_delete_after def test_resource_required_by(self): tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}, 'BResource': {'Type': 'GenericResourceType', diff --git a/heat/tests/test_provider_template.py b/heat/tests/test_provider_template.py index 5e9957c4..a20c9074 100644 --- a/heat/tests/test_provider_template.py +++ b/heat/tests/test_provider_template.py @@ -26,8 +26,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 +from heat.tests import utils class MyCloudResource(generic_rsrc.GenericResource): @@ -37,7 +36,7 @@ class MyCloudResource(generic_rsrc.GenericResource): class ProviderTemplateTest(HeatTestCase): def setUp(self): super(ProviderTemplateTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() resource._register_class('OS::ResourceType', generic_rsrc.GenericResource) resource._register_class('myCloud::ResourceType', @@ -84,8 +83,8 @@ class ProviderTemplateTest(HeatTestCase): def test_to_parameters(self): """Tests property conversion to parameter values.""" - setup_dummy_db() - stack = parser.Stack(dummy_context(), 'test_stack', + utils.setup_dummy_db() + stack = parser.Stack(utils.dummy_context(), 'test_stack', parser.Template({}), stack_id=uuidutils.generate_uuid()) diff --git a/heat/tests/test_rackspace_cloud_server.py b/heat/tests/test_rackspace_cloud_server.py index 07c6ad9c..fa109bd1 100644 --- a/heat/tests/test_rackspace_cloud_server.py +++ b/heat/tests/test_rackspace_cloud_server.py @@ -29,8 +29,6 @@ from heat.engine.resources.rackspace import rackspace_resource 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 wp_template = ''' @@ -81,7 +79,7 @@ class RackspaceCloudServerTest(HeatTestCase): def setUp(self): super(RackspaceCloudServerTest, self).setUp() self.fc = fakes.FakeClient() - setup_dummy_db() + utils.setup_dummy_db() # Test environment may not have pyrax client library installed and if # pyrax is not installed resource class would not be registered. # So register resource provider class explicitly for unit testing. @@ -107,7 +105,7 @@ class RackspaceCloudServerTest(HeatTestCase): def _setup_test_stack(self, stack_name): t = template_format.parse(wp_template) template = parser.Template(t) - stack = parser.Stack(dummy_context(), stack_name, template, + stack = parser.Stack(utils.dummy_context(), stack_name, template, environment.Environment({'flavor': '2'}), stack_id=uuidutils.generate_uuid()) return (t, stack) diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py index a5c16463..0e6bc890 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -24,15 +24,14 @@ 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 +from heat.tests import utils class ResourceTest(HeatTestCase): def setUp(self): super(ResourceTest, self).setUp() - setup_dummy_db() - self.stack = parser.Stack(dummy_context(), 'test_stack', + utils.setup_dummy_db() + self.stack = parser.Stack(utils.dummy_context(), 'test_stack', parser.Template({}), stack_id=uuidutils.generate_uuid()) @@ -158,7 +157,7 @@ class ResourceTest(HeatTestCase): tmpl1 = {'Type': 'Foo'} tmpl2 = {'Type': 'Foo'} tmpl3 = {'Type': 'Bar'} - stack2 = parser.Stack(dummy_context(), 'test_stack', + stack2 = parser.Stack(utils.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) @@ -570,8 +569,8 @@ class MetadataTest(HeatTestCase): 'Type': 'Foo', 'Metadata': {'Test': 'Initial metadata'} } - setup_dummy_db() - self.stack = parser.Stack(dummy_context(), + utils.setup_dummy_db() + self.stack = parser.Stack(utils.dummy_context(), 'test_stack', parser.Template({})) self.stack.store() self.res = generic_rsrc.GenericResource('metadata_resource', diff --git a/heat/tests/test_rpc_client.py b/heat/tests/test_rpc_client.py index 93a1bbe3..c7b8eba4 100644 --- a/heat/tests/test_rpc_client.py +++ b/heat/tests/test_rpc_client.py @@ -27,13 +27,13 @@ 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 +from heat.tests import utils class EngineRpcAPITestCase(testtools.TestCase): def setUp(self): - self.context = dummy_context() + self.context = utils.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 = dummy_context() + ctxt = utils.dummy_context() if 'rpcapi_class' in kwargs: rpcapi_class = kwargs['rpcapi_class'] del kwargs['rpcapi_class'] diff --git a/heat/tests/test_s3.py b/heat/tests/test_s3.py index 2b93c3e8..534de57d 100644 --- a/heat/tests/test_s3.py +++ b/heat/tests/test_s3.py @@ -25,8 +25,6 @@ from heat.engine import scheduler from heat.tests.common import HeatTestCase from heat.tests import utils from heat.tests import fakes -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack swiftclient = try_import('swiftclient.client') @@ -67,7 +65,7 @@ class s3Test(HeatTestCase): self.m.StubOutWithMock(swiftclient.Connection, 'get_auth') self.m.StubOutWithMock(clients.OpenStackClients, 'keystone') - setup_dummy_db() + utils.setup_dummy_db() def create_resource(self, t, stack, resource_name): rsrc = s3.S3Bucket('test_resource', @@ -92,7 +90,7 @@ class s3Test(HeatTestCase): self.m.ReplayAll() t = template_format.parse(swift_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'S3Bucket') ref_id = rsrc.FnGetRefId() @@ -130,7 +128,7 @@ class s3Test(HeatTestCase): t = template_format.parse(swift_template) properties = t['Resources']['S3Bucket']['Properties'] properties['AccessControl'] = 'PublicRead' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'S3Bucket') rsrc.delete() self.m.VerifyAll() @@ -150,7 +148,7 @@ class s3Test(HeatTestCase): t = template_format.parse(swift_template) properties = t['Resources']['S3Bucket']['Properties'] properties['AccessControl'] = 'PublicReadWrite' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'S3Bucket') rsrc.delete() self.m.VerifyAll() @@ -169,7 +167,7 @@ class s3Test(HeatTestCase): t = template_format.parse(swift_template) properties = t['Resources']['S3Bucket']['Properties'] properties['AccessControl'] = 'AuthenticatedRead' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'S3Bucket') rsrc.delete() self.m.VerifyAll() @@ -188,7 +186,7 @@ class s3Test(HeatTestCase): self.m.ReplayAll() t = template_format.parse(swift_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'S3BucketWebsite') rsrc.delete() self.m.VerifyAll() @@ -206,7 +204,7 @@ class s3Test(HeatTestCase): self.m.ReplayAll() t = template_format.parse(swift_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'S3Bucket') rsrc.delete() @@ -227,7 +225,7 @@ class s3Test(HeatTestCase): bucket = t['Resources']['S3Bucket'] bucket['DeletionPolicy'] = 'Retain' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'S3Bucket') rsrc.delete() self.assertEqual((rsrc.DELETE, rsrc.COMPLETE), rsrc.state) diff --git a/heat/tests/test_security_group.py b/heat/tests/test_security_group.py index 24b18fe0..e8e12f2c 100644 --- a/heat/tests/test_security_group.py +++ b/heat/tests/test_security_group.py @@ -20,11 +20,8 @@ from heat.engine import parser from heat.engine import resource from heat.tests.common import HeatTestCase from heat.tests.fakes import FakeKeystoneClient -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 -from heat.tests.utils import stack_delete_after from novaclient.v1_1 import security_groups as nova_sg from novaclient.v1_1 import security_group_rules as nova_sgr @@ -95,7 +92,7 @@ Resources: self.m.StubOutWithMock(nova_sg.SecurityGroupManager, 'delete') self.m.StubOutWithMock(nova_sg.SecurityGroupManager, 'get') self.m.StubOutWithMock(nova_sg.SecurityGroupManager, 'list') - setup_dummy_db() + utils.setup_dummy_db() self.m.StubOutWithMock(neutronclient.Client, 'create_security_group') self.m.StubOutWithMock( neutronclient.Client, 'create_security_group_rule') @@ -113,7 +110,7 @@ Resources: def parse_stack(self, t): stack_name = 'test_stack' tmpl = parser.Template(t) - stack = parser.Stack(dummy_context(), stack_name, tmpl) + stack = parser.Stack(utils.dummy_context(), stack_name, tmpl) stack.store() return stack @@ -123,7 +120,7 @@ Resources: self.assertEqual(ref_id, rsrc.FnGetRefId()) self.assertEqual(metadata, dict(rsrc.metadata)) - @stack_delete_after + @utils.stack_delete_after def test_security_group_nova(self): #create script clients.OpenStackClients.nova('compute').AndReturn(self.fc) @@ -195,7 +192,7 @@ Resources: stack.delete() self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_security_group_nova_exception(self): #create script clients.OpenStackClients.nova('compute').AndReturn(self.fc) @@ -274,7 +271,7 @@ Resources: self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_security_group_neutron(self): #create script clients.OpenStackClients.keystone().AndReturn( @@ -416,7 +413,7 @@ Resources: stack.delete() self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_security_group_neutron_exception(self): #create script clients.OpenStackClients.keystone().AndReturn( diff --git a/heat/tests/test_server_tags.py b/heat/tests/test_server_tags.py index 564bc587..742cc8a1 100644 --- a/heat/tests/test_server_tags.py +++ b/heat/tests/test_server_tags.py @@ -24,8 +24,6 @@ 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 instance_template = ''' @@ -92,13 +90,13 @@ class ServerTagsTest(HeatTestCase): def setUp(self): super(ServerTagsTest, self).setUp() self.fc = fakes.FakeClient() - setup_dummy_db() + utils.setup_dummy_db() def _setup_test_instance(self, intags=None, nova_tags=None): stack_name = 'tag_test' t = template_format.parse(instance_template) template = parser.Template(t) - stack = parser.Stack(dummy_context(), stack_name, template, + stack = parser.Stack(utils.dummy_context(), stack_name, template, environment.Environment({'KeyName': 'test'}), stack_id=uuidutils.generate_uuid()) @@ -142,7 +140,7 @@ class ServerTagsTest(HeatTestCase): stack_name = 'tag_test' t = template_format.parse(group_template) template = parser.Template(t) - stack = parser.Stack(dummy_context(), stack_name, template, + stack = parser.Stack(utils.dummy_context(), stack_name, template, environment.Environment({'KeyName': 'test'}), stack_id=uuidutils.generate_uuid()) diff --git a/heat/tests/test_signal.py b/heat/tests/test_signal.py index 3eb02074..61baf924 100644 --- a/heat/tests/test_signal.py +++ b/heat/tests/test_signal.py @@ -20,7 +20,6 @@ from heat.tests import generic_resource from heat.tests import fakes from heat.tests.common import HeatTestCase from heat.tests import utils -from heat.tests.utils import reset_dummy_db from heat.common import context from heat.common import exception @@ -66,7 +65,7 @@ class SignalTest(HeatTestCase): def tearDown(self): super(SignalTest, self).tearDown() - reset_dummy_db() + utils.reset_dummy_db() # Note tests creating a stack should be decorated with @stack_delete_after # to ensure the stack is properly cleaned up diff --git a/heat/tests/test_sqlalchemy_api.py b/heat/tests/test_sqlalchemy_api.py index 37eb98a9..0c7fb13d 100644 --- a/heat/tests/test_sqlalchemy_api.py +++ b/heat/tests/test_sqlalchemy_api.py @@ -22,9 +22,7 @@ from heat.engine import parser from heat.openstack.common import uuidutils from heat.tests.common import HeatTestCase from heat.tests import utils -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import dummy_context -from heat.tests.utils import reset_dummy_db + from heat.engine.clients import novaclient @@ -78,9 +76,9 @@ class SqlAlchemyTest(HeatTestCase): def setUp(self): super(SqlAlchemyTest, self).setUp() self.fc = fakes.FakeClient() - setup_dummy_db() - reset_dummy_db() - self.ctx = dummy_context() + utils.setup_dummy_db() + utils.reset_dummy_db() + self.ctx = utils.dummy_context() def tearDown(self): super(SqlAlchemyTest, self).tearDown() diff --git a/heat/tests/test_stack_resource.py b/heat/tests/test_stack_resource.py index 346adbce..2819de04 100644 --- a/heat/tests/test_stack_resource.py +++ b/heat/tests/test_stack_resource.py @@ -23,9 +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 +from heat.tests import utils ws_res_snippet = {"Type": "some_magic_type", "metadata": { @@ -95,22 +93,22 @@ class StackResourceTest(HeatTestCase): def setUp(self): super(StackResourceTest, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() resource._register_class('some_magic_type', MyStackResource) resource._register_class('GenericResource', generic_rsrc.GenericResource) t = parser.Template({template.RESOURCES: {"provider_resource": ws_res_snippet}}) - self.parent_stack = parser.Stack(dummy_context(), 'test_stack', t, - stack_id=uuidutils.generate_uuid()) + self.parent_stack = parser.Stack(utils.dummy_context(), 'test_stack', + t, stack_id=uuidutils.generate_uuid()) self.parent_resource = MyStackResource('test', ws_res_snippet, self.parent_stack) self.templ = template_format.parse(wp_template) self.generic_template = template_format.parse(generic_template) - @stack_delete_after + @utils.stack_delete_after def test_create_with_template_ok(self): self.parent_resource.create_with_template(self.templ, {"KeyName": "key"}) @@ -122,7 +120,7 @@ class StackResourceTest(HeatTestCase): self.assertEqual(self.templ, self.stack.t.t) self.assertEqual(self.stack.id, self.parent_resource.resource_id) - @stack_delete_after + @utils.stack_delete_after def test_update_with_template_ok(self): """ The update_with_template method updates the nested stack with the @@ -143,7 +141,7 @@ class StackResourceTest(HeatTestCase): self.assertEqual(set(self.stack.resources.keys()), set(["WebServer", "WebServer2"])) - @stack_delete_after + @utils.stack_delete_after def test_load_nested_ok(self): self.parent_resource.create_with_template(self.templ, {"KeyName": "key"}) @@ -159,7 +157,7 @@ class StackResourceTest(HeatTestCase): self.parent_resource.nested() self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_load_nested_non_exist(self): self.parent_resource.create_with_template(self.templ, {"KeyName": "key"}) @@ -210,7 +208,7 @@ class StackResourceTest(HeatTestCase): self.m.VerifyAll() - @stack_delete_after + @utils.stack_delete_after def test_create_complete_state_err(self): """ check_create_complete should raise error when create task is @@ -258,7 +256,7 @@ class StackResourceTest(HeatTestCase): # Restore state_set to let clean up proceed self.stack.state_set = st_set - @stack_delete_after + @utils.stack_delete_after def test_suspend_complete_state_err(self): """ check_suspend_complete should raise error when suspend task is @@ -288,7 +286,7 @@ class StackResourceTest(HeatTestCase): # Restore state_set to let clean up proceed self.stack.state_set = st_set - @stack_delete_after + @utils.stack_delete_after def test_resume_complete_state_err(self): """ check_resume_complete should raise error when resume task is diff --git a/heat/tests/test_swift.py b/heat/tests/test_swift.py index 7d5b587d..aa5ee4cf 100644 --- a/heat/tests/test_swift.py +++ b/heat/tests/test_swift.py @@ -26,8 +26,6 @@ from heat.engine import scheduler from heat.tests.common import HeatTestCase from heat.tests import fakes from heat.tests import utils -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack swiftclient = try_import('swiftclient.client') @@ -68,7 +66,7 @@ class swiftTest(HeatTestCase): self.m.StubOutWithMock(swiftclient.Connection, 'get_auth') self.m.StubOutWithMock(clients.OpenStackClients, 'keystone') - setup_dummy_db() + utils.setup_dummy_db() def create_resource(self, t, stack, resource_name): rsrc = swift.SwiftContainer( @@ -83,7 +81,7 @@ class swiftTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(swift_template) t['Resources']['SwiftContainer']['Properties']['name'] = 'the_name' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = swift.SwiftContainer( 'test_resource', t['Resources']['SwiftContainer'], @@ -133,7 +131,7 @@ class swiftTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(swift_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'SwiftContainer') ref_id = rsrc.FnGetRefId() @@ -173,7 +171,7 @@ class swiftTest(HeatTestCase): t = template_format.parse(swift_template) properties = t['Resources']['SwiftContainer']['Properties'] properties['X-Container-Read'] = '.r:*' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'SwiftContainer') rsrc.delete() self.m.VerifyAll() @@ -193,7 +191,7 @@ class swiftTest(HeatTestCase): properties = t['Resources']['SwiftContainer']['Properties'] properties['X-Container-Read'] = '.r:*' properties['X-Container-Write'] = '.r:*' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'SwiftContainer') rsrc.delete() self.m.VerifyAll() @@ -212,7 +210,7 @@ class swiftTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(swift_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'SwiftContainerWebsite') rsrc.delete() self.m.VerifyAll() @@ -230,7 +228,7 @@ class swiftTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(swift_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'SwiftContainer') rsrc.delete() @@ -251,7 +249,7 @@ class swiftTest(HeatTestCase): container = t['Resources']['SwiftContainer'] container['DeletionPolicy'] = 'Retain' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_resource(t, stack, 'SwiftContainer') rsrc.delete() self.assertEqual((rsrc.DELETE, rsrc.COMPLETE), rsrc.state) diff --git a/heat/tests/test_template_format.py b/heat/tests/test_template_format.py index d3b0ca15..83843a1f 100644 --- a/heat/tests/test_template_format.py +++ b/heat/tests/test_template_format.py @@ -18,8 +18,7 @@ import os from heat.engine import clients from heat.common import template_format from heat.tests.common import HeatTestCase -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack +from heat.tests import utils class JsonToYamlTest(HeatTestCase): @@ -115,7 +114,7 @@ class JsonYamlResolvedCompareTest(HeatTestCase): super(JsonYamlResolvedCompareTest, self).setUp() self.longMessage = True self.maxDiff = None - setup_dummy_db() + utils.setup_dummy_db() def load_template(self, file_name): filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), @@ -134,8 +133,8 @@ class JsonYamlResolvedCompareTest(HeatTestCase): t2 = self.load_template(yaml_file) del(t2[u'HeatTemplateFormatVersion']) - stack1 = parse_stack(t1, parameters) - stack2 = parse_stack(t2, parameters) + stack1 = utils.parse_stack(t1, parameters) + stack2 = utils.parse_stack(t2, parameters) # compare resources separately so that resolved static data # is compared diff --git a/heat/tests/test_user.py b/heat/tests/test_user.py index 052eb85b..fab51dcf 100644 --- a/heat/tests/test_user.py +++ b/heat/tests/test_user.py @@ -23,8 +23,6 @@ from heat.engine.resources import user from heat.tests.common import HeatTestCase from heat.tests import fakes from heat.tests import utils -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack import keystoneclient.exceptions @@ -94,7 +92,7 @@ class UserPolicyTestCase(HeatTestCase): username = utils.PhysName('test_stack', 'CfnUser') self.fc = fakes.FakeKeystoneClient(username=username) cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role') - setup_dummy_db() + utils.setup_dummy_db() class UserTest(UserPolicyTestCase): @@ -116,7 +114,7 @@ class UserTest(UserPolicyTestCase): self.m.ReplayAll() t = template_format.parse(user_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_user(t, stack, 'CfnUser') self.assertEqual(self.fc.user_id, rsrc.resource_id) @@ -156,7 +154,7 @@ class UserTest(UserPolicyTestCase): self.m.ReplayAll() t = template_format.parse(user_policy_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_user(t, stack, 'CfnUser') self.assertEqual(self.fc.user_id, rsrc.resource_id) @@ -196,7 +194,7 @@ class UserTest(UserPolicyTestCase): t = template_format.parse(user_policy_template) t['Resources']['CfnUser']['Properties']['Policies'] = ['NoExistBad'] - stack = parse_stack(t) + stack = utils.parse_stack(t) resource_name = 'CfnUser' rsrc = user.User(resource_name, t['Resources'][resource_name], @@ -217,7 +215,7 @@ class UserTest(UserPolicyTestCase): self.m.ReplayAll() t = template_format.parse(user_policy_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_user(t, stack, 'CfnUser') self.assertEqual(self.fc.user_id, rsrc.resource_id) @@ -243,7 +241,7 @@ class UserTest(UserPolicyTestCase): t = template_format.parse(user_policy_template) t['Resources']['CfnUser']['Properties']['Policies'] = [ 'WebServerAccessPolicy', {'an_ignored': 'policy'}] - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = self.create_user(t, stack, 'CfnUser') self.assertEqual(self.fc.user_id, rsrc.resource_id) @@ -284,7 +282,7 @@ class AccessKeyTest(UserPolicyTestCase): t = template_format.parse(user_accesskey_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) self.create_user(t, stack, 'CfnUser') rsrc = self.create_access_key(t, stack, 'HostKeys') @@ -317,7 +315,7 @@ class AccessKeyTest(UserPolicyTestCase): self.m.ReplayAll() t = template_format.parse(user_accesskey_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) self.create_user(t, stack, 'CfnUser') rsrc = self.create_access_key(t, stack, 'HostKeys') @@ -338,7 +336,7 @@ class AccessKeyTest(UserPolicyTestCase): t = template_format.parse(user_accesskey_template) # Set the resource properties UserName to an unknown user t['Resources']['HostKeys']['Properties']['UserName'] = 'NonExistant' - stack = parse_stack(t) + stack = utils.parse_stack(t) stack.resources['CfnUser'].resource_id = self.fc.user_id rsrc = user.AccessKey('HostKeys', @@ -358,7 +356,7 @@ class AccessPolicyTest(UserPolicyTestCase): def test_accesspolicy_create_ok(self): t = template_format.parse(user_policy_template) - stack = parse_stack(t) + stack = utils.parse_stack(t) resource_name = 'WebServerAccessPolicy' rsrc = user.AccessPolicy(resource_name, @@ -371,7 +369,7 @@ class AccessPolicyTest(UserPolicyTestCase): t = template_format.parse(user_policy_template) resource_name = 'WebServerAccessPolicy' t['Resources'][resource_name]['Properties']['AllowedResources'] = [] - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = user.AccessPolicy(resource_name, t['Resources'][resource_name], @@ -384,7 +382,7 @@ class AccessPolicyTest(UserPolicyTestCase): resource_name = 'WebServerAccessPolicy' t['Resources'][resource_name]['Properties']['AllowedResources'] = [ 'NoExistResource'] - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = user.AccessPolicy(resource_name, t['Resources'][resource_name], @@ -394,7 +392,7 @@ class AccessPolicyTest(UserPolicyTestCase): def test_accesspolicy_update(self): t = template_format.parse(user_policy_template) resource_name = 'WebServerAccessPolicy' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = user.AccessPolicy(resource_name, t['Resources'][resource_name], @@ -405,7 +403,7 @@ class AccessPolicyTest(UserPolicyTestCase): def test_accesspolicy_access_allowed(self): t = template_format.parse(user_policy_template) resource_name = 'WebServerAccessPolicy' - stack = parse_stack(t) + stack = utils.parse_stack(t) rsrc = user.AccessPolicy(resource_name, t['Resources'][resource_name], diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py index 69fb7561..12b424a6 100644 --- a/heat/tests/test_validate.py +++ b/heat/tests/test_validate.py @@ -26,8 +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 +from heat.tests import utils test_template_volumeattach = ''' { @@ -545,8 +544,8 @@ class validateTest(HeatTestCase): resources.initialise() self.fc = fakes.FakeClient() resources.initialise() - setup_dummy_db() - self.ctx = dummy_context() + utils.setup_dummy_db() + self.ctx = utils.dummy_context() def test_validate_volumeattach_valid(self): t = template_format.parse(test_template_volumeattach % 'vdq') diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py index 261e852a..64bd0a2d 100644 --- a/heat/tests/test_volume.py +++ b/heat/tests/test_volume.py @@ -28,8 +28,6 @@ from heat.openstack.common.importutils import try_import from heat.tests.common import HeatTestCase from heat.tests.v1_1 import fakes from heat.tests import utils -from heat.tests.utils import setup_dummy_db -from heat.tests.utils import parse_stack from cinderclient.v1 import client as cinderclient @@ -85,7 +83,7 @@ class VolumeTest(HeatTestCase): self.m.StubOutWithMock(self.cinder_fc.volumes, 'delete') self.m.StubOutWithMock(self.fc.volumes, 'create_server_volume') self.m.StubOutWithMock(self.fc.volumes, 'delete_server_volume') - setup_dummy_db() + utils.setup_dummy_db() def create_volume(self, t, stack, resource_name): data = t['Resources'][resource_name] @@ -139,7 +137,7 @@ class VolumeTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(volume_template) - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = self.create_volume(t, stack, 'DataVolume') self.assertEqual(fv.status, 'available') @@ -189,7 +187,7 @@ class VolumeTest(HeatTestCase): self.m.ReplayAll() t = template_format.parse(volume_template) - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = stack['DataVolume'] self.assertEqual(rsrc.validate(), None) @@ -210,7 +208,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = vol.Volume('DataVolume', t['Resources']['DataVolume'], @@ -233,7 +231,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) scheduler.TaskRunner(stack['DataVolume'].create)() self.assertEqual(fv.status, 'available') @@ -264,7 +262,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) scheduler.TaskRunner(stack['DataVolume'].create)() self.assertEqual(fv.status, 'available') @@ -310,7 +308,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) scheduler.TaskRunner(stack['DataVolume'].create)() self.assertEqual(fv.status, 'available') @@ -340,7 +338,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) scheduler.TaskRunner(stack['DataVolume'].create)() rsrc = self.create_attachment(t, stack, 'MountPoint') @@ -369,7 +367,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) scheduler.TaskRunner(stack['DataVolume'].create)() self.assertEqual(fv.status, 'available') @@ -398,7 +396,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) scheduler.TaskRunner(stack['DataVolume'].create)() self.assertEqual(fv.status, 'available') @@ -426,7 +424,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['DeletionPolicy'] = 'Snapshot' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = self.create_volume(t, stack, 'DataVolume') @@ -450,7 +448,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['DeletionPolicy'] = 'Snapshot' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = self.create_volume(t, stack, 'DataVolume') @@ -473,7 +471,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['DeletionPolicy'] = 'Snapshot' t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = vol.Volume('DataVolume', t['Resources']['DataVolume'], stack) @@ -507,7 +505,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['Properties']['SnapshotId'] = 'backup-123' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) self.create_volume(t, stack, 'DataVolume') self.assertEqual(fv.status, 'available') @@ -537,7 +535,7 @@ class VolumeTest(HeatTestCase): t = template_format.parse(volume_template) t['Resources']['DataVolume']['Properties']['SnapshotId'] = 'backup-123' t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova' - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = vol.Volume('DataVolume', t['Resources']['DataVolume'], @@ -580,7 +578,7 @@ class VolumeTest(HeatTestCase): 'snapshot_id': 'snap-123', 'source_volid': 'vol-012', } - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = vol.CinderVolume('DataVolume', t['Resources']['DataVolume'], @@ -611,7 +609,7 @@ class VolumeTest(HeatTestCase): 'size': '1', 'availability_zone': 'nova', } - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = vol.CinderVolume('DataVolume', t['Resources']['DataVolume'], @@ -649,7 +647,7 @@ class VolumeTest(HeatTestCase): 'size': '1', 'availability_zone': 'nova', } - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) rsrc = vol.CinderVolume('DataVolume', t['Resources']['DataVolume'], @@ -701,7 +699,7 @@ class VolumeTest(HeatTestCase): 'volume_id': {'Ref': 'DataVolume'}, 'mountpoint': '/dev/vdc' } - stack = parse_stack(t, stack_name=stack_name) + stack = utils.parse_stack(t, stack_name=stack_name) scheduler.TaskRunner(stack['DataVolume'].create)() self.assertEqual(fv.status, 'available') diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py index e1a3ae20..9c6246a5 100644 --- a/heat/tests/test_vpc.py +++ b/heat/tests/test_vpc.py @@ -22,8 +22,6 @@ from heat.engine import resource from heat.tests.common import HeatTestCase from heat.tests import fakes from heat.tests import utils -from heat.tests.utils import dummy_context -from heat.tests.utils import setup_dummy_db try: from neutronclient.common.exceptions import NeutronClientException @@ -37,7 +35,7 @@ class VPCTestBase(HeatTestCase): @skipIf(neutronclient is None, 'neutronclient unavaialble') def setUp(self): super(VPCTestBase, self).setUp() - setup_dummy_db() + utils.setup_dummy_db() self.m.StubOutWithMock(neutronclient.Client, 'add_interface_router') self.m.StubOutWithMock(neutronclient.Client, 'add_gateway_router') self.m.StubOutWithMock(neutronclient.Client, 'create_network') @@ -73,7 +71,7 @@ class VPCTestBase(HeatTestCase): def parse_stack(self, t): stack_name = 'test_stack' tmpl = parser.Template(t) - stack = parser.Stack(dummy_context(), stack_name, tmpl) + stack = parser.Stack(utils.dummy_context(), stack_name, tmpl) stack.store() return stack diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py index a5c31759..16fa7cf9 100644 --- a/heat/tests/test_waitcondition.py +++ b/heat/tests/test_waitcondition.py @@ -21,7 +21,6 @@ from oslo.config import cfg from heat.tests.common import HeatTestCase from heat.tests import fakes from heat.tests import utils -from heat.tests.utils import reset_dummy_db import heat.db.api as db_api from heat.common import template_format @@ -90,7 +89,7 @@ class WaitConditionTest(HeatTestCase): def tearDown(self): super(WaitConditionTest, self).tearDown() - reset_dummy_db() + utils.reset_dummy_db() # Note tests creating a stack should be decorated with @stack_delete_after # to ensure the stack is properly cleaned up @@ -368,7 +367,7 @@ class WaitConditionHandleTest(HeatTestCase): def tearDown(self): super(WaitConditionHandleTest, self).tearDown() - reset_dummy_db() + utils.reset_dummy_db() def create_stack(self, stack_name='test_stack2', params={}): temp = template_format.parse(test_template_waitcondition) diff --git a/heat/tests/test_watch.py b/heat/tests/test_watch.py index fe1acad6..6d5fb4b3 100644 --- a/heat/tests/test_watch.py +++ b/heat/tests/test_watch.py @@ -23,7 +23,6 @@ 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(object): @@ -47,7 +46,7 @@ class WatchRuleTest(HeatTestCase): # Create a dummy stack in the DB as WatchRule instances # must be associated with a stack utils.setup_dummy_db() - ctx = dummy_context() + ctx = utils.dummy_context() ctx.auth_token = 'abcd1234' empty_tmpl = {"template": {}} tmpl = parser.Template(empty_tmpl) @@ -64,7 +63,7 @@ class WatchRuleTest(HeatTestCase): self.setUpDatabase() self.username = 'watchrule_test_user' - self.ctx = dummy_context() + self.ctx = utils.dummy_context() self.ctx.auth_token = 'abcd1234' self.m.ReplayAll()