Register ResourceWithPropsAndAttrs in HeatTestCase
Move registration of the ResourceWithPropsAndAttrs resource to the main test class. Change-Id: I97a71eaba735d49105a1b5a4df615c678b038f83
This commit is contained in:
parent
ce7ad1095f
commit
f7c165d5c3
@ -19,19 +19,15 @@ from heat.common import exception
|
|||||||
from heat.common import grouputils
|
from heat.common import grouputils
|
||||||
from heat.common import template_format
|
from heat.common import template_format
|
||||||
from heat.engine import function
|
from heat.engine import function
|
||||||
from heat.engine import resource
|
|
||||||
from heat.engine import rsrc_defn
|
from heat.engine import rsrc_defn
|
||||||
from heat.tests.autoscaling import inline_templates
|
from heat.tests.autoscaling import inline_templates
|
||||||
from heat.tests import common
|
from heat.tests import common
|
||||||
from heat.tests import generic_resource
|
|
||||||
from heat.tests import utils
|
from heat.tests import utils
|
||||||
|
|
||||||
|
|
||||||
class TestAutoScalingGroupValidation(common.HeatTestCase):
|
class TestAutoScalingGroupValidation(common.HeatTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestAutoScalingGroupValidation, self).setUp()
|
super(TestAutoScalingGroupValidation, self).setUp()
|
||||||
resource._register_class('ResourceWithPropsAndAttrs',
|
|
||||||
generic_resource.ResourceWithPropsAndAttrs)
|
|
||||||
self.parsed = template_format.parse(inline_templates.as_heat_template)
|
self.parsed = template_format.parse(inline_templates.as_heat_template)
|
||||||
|
|
||||||
def test_invalid_min_size(self):
|
def test_invalid_min_size(self):
|
||||||
@ -107,8 +103,6 @@ class TestInitialGroupSize(common.HeatTestCase):
|
|||||||
class TestGroupAdjust(common.HeatTestCase):
|
class TestGroupAdjust(common.HeatTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestGroupAdjust, self).setUp()
|
super(TestGroupAdjust, self).setUp()
|
||||||
resource._register_class('ResourceWithPropsAndAttrs',
|
|
||||||
generic_resource.ResourceWithPropsAndAttrs)
|
|
||||||
|
|
||||||
t = template_format.parse(inline_templates.as_heat_template)
|
t = template_format.parse(inline_templates.as_heat_template)
|
||||||
self.stack = utils.parse_stack(t, params=inline_templates.as_params)
|
self.stack = utils.parse_stack(t, params=inline_templates.as_params)
|
||||||
@ -276,8 +270,6 @@ class TestGroupAdjust(common.HeatTestCase):
|
|||||||
class TestGroupCrud(common.HeatTestCase):
|
class TestGroupCrud(common.HeatTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestGroupCrud, self).setUp()
|
super(TestGroupCrud, self).setUp()
|
||||||
resource._register_class('ResourceWithPropsAndAttrs',
|
|
||||||
generic_resource.ResourceWithPropsAndAttrs)
|
|
||||||
self.stub_ImageConstraint_validate()
|
self.stub_ImageConstraint_validate()
|
||||||
self.stub_FlavorConstraint_validate()
|
self.stub_FlavorConstraint_validate()
|
||||||
self.stub_SnapshotConstraint_validate()
|
self.stub_SnapshotConstraint_validate()
|
||||||
@ -355,8 +347,6 @@ class TestGroupCrud(common.HeatTestCase):
|
|||||||
class HeatScalingGroupAttrTest(common.HeatTestCase):
|
class HeatScalingGroupAttrTest(common.HeatTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(HeatScalingGroupAttrTest, self).setUp()
|
super(HeatScalingGroupAttrTest, self).setUp()
|
||||||
resource._register_class('ResourceWithPropsAndAttrs',
|
|
||||||
generic_resource.ResourceWithPropsAndAttrs)
|
|
||||||
|
|
||||||
t = template_format.parse(inline_templates.as_heat_template)
|
t = template_format.parse(inline_templates.as_heat_template)
|
||||||
self.stack = utils.parse_stack(t, params=inline_templates.as_params)
|
self.stack = utils.parse_stack(t, params=inline_templates.as_params)
|
||||||
@ -454,8 +444,6 @@ class RollingUpdatePolicyTest(common.HeatTestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(RollingUpdatePolicyTest, self).setUp()
|
super(RollingUpdatePolicyTest, self).setUp()
|
||||||
self.stub_keystoneclient(username='test_stack.CfnLBUser')
|
self.stub_keystoneclient(username='test_stack.CfnLBUser')
|
||||||
resource._register_class('ResourceWithPropsAndAttrs',
|
|
||||||
generic_resource.ResourceWithPropsAndAttrs)
|
|
||||||
|
|
||||||
def test_parse_without_update_policy(self):
|
def test_parse_without_update_policy(self):
|
||||||
tmpl = template_format.parse(inline_templates.as_heat_template)
|
tmpl = template_format.parse(inline_templates.as_heat_template)
|
||||||
@ -516,8 +504,6 @@ class RollingUpdatePolicyDiffTest(common.HeatTestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(RollingUpdatePolicyDiffTest, self).setUp()
|
super(RollingUpdatePolicyDiffTest, self).setUp()
|
||||||
self.stub_keystoneclient(username='test_stack.CfnLBUser')
|
self.stub_keystoneclient(username='test_stack.CfnLBUser')
|
||||||
resource._register_class('ResourceWithPropsAndAttrs',
|
|
||||||
generic_resource.ResourceWithPropsAndAttrs)
|
|
||||||
|
|
||||||
def validate_update_policy_diff(self, current, updated):
|
def validate_update_policy_diff(self, current, updated):
|
||||||
# load current stack
|
# load current stack
|
||||||
@ -585,8 +571,6 @@ class IncorrectUpdatePolicyTest(common.HeatTestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(IncorrectUpdatePolicyTest, self).setUp()
|
super(IncorrectUpdatePolicyTest, self).setUp()
|
||||||
self.stub_keystoneclient(username='test_stack.CfnLBUser')
|
self.stub_keystoneclient(username='test_stack.CfnLBUser')
|
||||||
resource._register_class('ResourceWithPropsAndAttrs',
|
|
||||||
generic_resource.ResourceWithPropsAndAttrs)
|
|
||||||
|
|
||||||
def test_with_update_policy_aws(self):
|
def test_with_update_policy_aws(self):
|
||||||
t = template_format.parse(inline_templates.as_heat_template)
|
t = template_format.parse(inline_templates.as_heat_template)
|
||||||
|
@ -23,7 +23,6 @@ from heat.engine import resource
|
|||||||
from heat.engine import scheduler
|
from heat.engine import scheduler
|
||||||
from heat.tests.autoscaling import inline_templates
|
from heat.tests.autoscaling import inline_templates
|
||||||
from heat.tests import common
|
from heat.tests import common
|
||||||
from heat.tests import generic_resource
|
|
||||||
from heat.tests import utils
|
from heat.tests import utils
|
||||||
|
|
||||||
|
|
||||||
@ -32,10 +31,6 @@ as_params = inline_templates.as_params
|
|||||||
|
|
||||||
|
|
||||||
class TestAutoScalingPolicy(common.HeatTestCase):
|
class TestAutoScalingPolicy(common.HeatTestCase):
|
||||||
def setUp(self):
|
|
||||||
super(TestAutoScalingPolicy, self).setUp()
|
|
||||||
resource._register_class('ResourceWithPropsAndAttrs',
|
|
||||||
generic_resource.ResourceWithPropsAndAttrs)
|
|
||||||
|
|
||||||
def create_scaling_policy(self, t, stack, resource_name):
|
def create_scaling_policy(self, t, stack, resource_name):
|
||||||
rsrc = stack[resource_name]
|
rsrc = stack[resource_name]
|
||||||
|
@ -129,6 +129,8 @@ class HeatTestCase(testscenarios.WithScenarios,
|
|||||||
generic_rsrc.ResourceWithProps)
|
generic_rsrc.ResourceWithProps)
|
||||||
resource._register_class('ResourceWithResourceIDType',
|
resource._register_class('ResourceWithResourceIDType',
|
||||||
generic_rsrc.ResourceWithResourceID)
|
generic_rsrc.ResourceWithResourceID)
|
||||||
|
resource._register_class('ResourceWithPropsAndAttrs',
|
||||||
|
generic_rsrc.ResourceWithPropsAndAttrs)
|
||||||
resource._register_class('ResWithComplexPropsAndAttrs',
|
resource._register_class('ResWithComplexPropsAndAttrs',
|
||||||
generic_rsrc.ResWithComplexPropsAndAttrs)
|
generic_rsrc.ResWithComplexPropsAndAttrs)
|
||||||
resource._register_class('ResourceWithComplexAttributesType',
|
resource._register_class('ResourceWithComplexAttributesType',
|
||||||
|
@ -26,7 +26,6 @@ from heat.engine import scheduler
|
|||||||
from heat.engine import stack as parser
|
from heat.engine import stack as parser
|
||||||
from heat.tests.autoscaling import inline_templates
|
from heat.tests.autoscaling import inline_templates
|
||||||
from heat.tests import common
|
from heat.tests import common
|
||||||
from heat.tests import generic_resource
|
|
||||||
from heat.tests import utils
|
from heat.tests import utils
|
||||||
|
|
||||||
|
|
||||||
@ -324,8 +323,6 @@ class ReplaceTest(common.HeatTestCase):
|
|||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(ReplaceTest, self).setUp()
|
super(ReplaceTest, self).setUp()
|
||||||
resource._register_class('ResourceWithPropsAndAttrs',
|
|
||||||
generic_resource.ResourceWithPropsAndAttrs)
|
|
||||||
t = template_format.parse(inline_templates.as_template)
|
t = template_format.parse(inline_templates.as_template)
|
||||||
self.stack = utils.parse_stack(t, params=inline_templates.as_params)
|
self.stack = utils.parse_stack(t, params=inline_templates.as_params)
|
||||||
lc = self.create_launch_config(t, self.stack)
|
lc = self.create_launch_config(t, self.stack)
|
||||||
|
Loading…
Reference in New Issue
Block a user