openstack/deb-heat
Code Issues Proposed changes

Merge "Stop patching the GenericResource's property_schema"

Browse Source
This commit is contained in:
Jenkins 2013-07-07 06:49:30 +00:00 committed by Gerrit Code Review
commit 78d38ab038
4 changed files with 58 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heat/tests/generic_resource.py
View File

@ -41,3 +41,12 @@ class GenericResource(resource.Resource):
def handle_resume(self): def handle_resume(self):
logger.warning('Resuming generic resource (Type "%s")' % self.type()) logger.warning('Resuming generic resource (Type "%s")' % self.type())
class ResourceWithProps(GenericResource):
properties_schema = {'Foo': {'Type': 'String'}}
class ResourceWithRequiredProps(GenericResource):
properties_schema = {'Foo': {'Type': 'String',
'Required': True}}

19
heat/tests/test_event.py
View File

@ -28,8 +28,8 @@ from heat.tests import generic_resource as generic_rsrc
tmpl = { tmpl = {
'Resources': { 'Resources': {
'EventTestResource': { 'EventTestResource': {
'Type': 'GenericResourceType', 'Type': 'ResourceWithRequiredProps',
'Properties': {'foo': True} 'Properties': {'Foo': 'goo'}
} }
} }
} }
@ -48,12 +48,8 @@ class EventTest(HeatTestCase):
self.m.ReplayAll() self.m.ReplayAll()
# patch in a dummy property schema for GenericResource resource._register_class('ResourceWithRequiredProps',
dummy_schema = {'foo': {'Type': 'Boolean', 'Required': True}} generic_rsrc.ResourceWithRequiredProps)
generic_rsrc.GenericResource.properties_schema = dummy_schema
resource._register_class('GenericResourceType',
generic_rsrc.GenericResource)
self.stack = parser.Stack(self.ctx, 'event_load_test_stack', self.stack = parser.Stack(self.ctx, 'event_load_test_stack',
template.Template(tmpl)) template.Template(tmpl))
@ -83,7 +79,7 @@ class EventTest(HeatTestCase):
self.assertEqual(loaded_e.status, 'IN_PROGRESS') self.assertEqual(loaded_e.status, 'IN_PROGRESS')
self.assertEqual(loaded_e.reason, 'Testing') self.assertEqual(loaded_e.reason, 'Testing')
self.assertNotEqual(loaded_e.timestamp, None) self.assertNotEqual(loaded_e.timestamp, None)
self.assertEqual(loaded_e.resource_properties, {'foo': True}) self.assertEqual(loaded_e.resource_properties, {'Foo': 'goo'})
def test_identifier(self): def test_identifier(self):
e = event.Event(self.ctx, self.stack, self.resource, e = event.Event(self.ctx, self.stack, self.resource,
@ -100,9 +96,10 @@ class EventTest(HeatTestCase):
self.assertEqual(e.identifier(), expected_identifier) self.assertEqual(e.identifier(), expected_identifier)
def test_badprop(self): def test_badprop(self):
tmpl = {'Type': 'GenericResourceType', 'Properties': {'foo': 'abc'}} tmpl = {'Type': 'ResourceWithRequiredProps',
'Properties': {'Foo': False}}
rname = 'bad_resource' rname = 'bad_resource'
res = generic_rsrc.GenericResource(rname, tmpl, self.stack) res = generic_rsrc.ResourceWithRequiredProps(rname, tmpl, self.stack)
e = event.Event(self.ctx, self.stack, res, e = event.Event(self.ctx, self.stack, res,
'TEST', 'IN_PROGRESS', 'Testing', 'TEST', 'IN_PROGRESS', 'Testing',
'wibble', res.properties) 'wibble', res.properties)

82
heat/tests/test_parser.py
View File

@ -519,9 +519,10 @@ class StackTest(HeatTestCase):
self.ctx.user = self.username self.ctx.user = self.username
self.ctx.tenant_id = 'test_tenant' self.ctx.tenant_id = 'test_tenant'
generic_rsrc.GenericResource.properties_schema = {}
resource._register_class('GenericResourceType', resource._register_class('GenericResourceType',
generic_rsrc.GenericResource) generic_rsrc.GenericResource)
resource._register_class('ResourceWithPropsType',
generic_rsrc.ResourceWithProps)
self.m.ReplayAll() self.m.ReplayAll()
@ -946,11 +947,7 @@ class StackTest(HeatTestCase):
@stack_delete_after @stack_delete_after
def test_update_modify_ok_replace(self): def test_update_modify_ok_replace(self):
# patch in a dummy property schema for GenericResource tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType',
'Properties': {'Foo': 'abc'}}}} 'Properties': {'Foo': 'abc'}}}}
self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
@ -964,7 +961,7 @@ class StackTest(HeatTestCase):
self.assertEqual(self.stack.state, self.assertEqual(self.stack.state,
(parser.Stack.CREATE, parser.Stack.COMPLETE)) (parser.Stack.CREATE, parser.Stack.COMPLETE))
tmpl2 = {'Resources': {'AResource': {'Type': 'GenericResourceType', tmpl2 = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'xyz'}}}} 'Properties': {'Foo': 'xyz'}}}}
updated_stack = parser.Stack(self.ctx, 'updated_stack', updated_stack = parser.Stack(self.ctx, 'updated_stack',
@ -983,11 +980,7 @@ class StackTest(HeatTestCase):
@stack_delete_after @stack_delete_after
def test_update_modify_update_failed(self): def test_update_modify_update_failed(self):
# patch in a dummy property schema for GenericResource tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType',
'Properties': {'Foo': 'abc'}}}} 'Properties': {'Foo': 'abc'}}}}
self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
@ -1006,7 +999,7 @@ class StackTest(HeatTestCase):
res.update_allowed_keys = ('Properties',) res.update_allowed_keys = ('Properties',)
res.update_allowed_properties = ('Foo',) res.update_allowed_properties = ('Foo',)
tmpl2 = {'Resources': {'AResource': {'Type': 'GenericResourceType', tmpl2 = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'xyz'}}}} 'Properties': {'Foo': 'xyz'}}}}
updated_stack = parser.Stack(self.ctx, 'updated_stack', updated_stack = parser.Stack(self.ctx, 'updated_stack',
@ -1028,11 +1021,7 @@ class StackTest(HeatTestCase):
@stack_delete_after @stack_delete_after
def test_update_modify_replace_failed_delete(self): def test_update_modify_replace_failed_delete(self):
# patch in a dummy property schema for GenericResource tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType',
'Properties': {'Foo': 'abc'}}}} 'Properties': {'Foo': 'abc'}}}}
self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
@ -1047,7 +1036,7 @@ class StackTest(HeatTestCase):
self.assertEqual(self.stack.state, self.assertEqual(self.stack.state,
(parser.Stack.CREATE, parser.Stack.COMPLETE)) (parser.Stack.CREATE, parser.Stack.COMPLETE))
tmpl2 = {'Resources': {'AResource': {'Type': 'GenericResourceType', tmpl2 = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'xyz'}}}} 'Properties': {'Foo': 'xyz'}}}}
updated_stack = parser.Stack(self.ctx, 'updated_stack', updated_stack = parser.Stack(self.ctx, 'updated_stack',
@ -1072,11 +1061,7 @@ class StackTest(HeatTestCase):
@stack_delete_after @stack_delete_after
def test_update_modify_replace_failed_create(self): def test_update_modify_replace_failed_create(self):
# patch in a dummy property schema for GenericResource tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType',
'Properties': {'Foo': 'abc'}}}} 'Properties': {'Foo': 'abc'}}}}
self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
@ -1091,7 +1076,7 @@ class StackTest(HeatTestCase):
self.assertEqual(self.stack.state, self.assertEqual(self.stack.state,
(parser.Stack.CREATE, parser.Stack.COMPLETE)) (parser.Stack.CREATE, parser.Stack.COMPLETE))
tmpl2 = {'Resources': {'AResource': {'Type': 'GenericResourceType', tmpl2 = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'xyz'}}}} 'Properties': {'Foo': 'xyz'}}}}
updated_stack = parser.Stack(self.ctx, 'updated_stack', updated_stack = parser.Stack(self.ctx, 'updated_stack',
@ -1149,11 +1134,7 @@ class StackTest(HeatTestCase):
@stack_delete_after @stack_delete_after
def test_update_rollback(self): def test_update_rollback(self):
# patch in a dummy property schema for GenericResource tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType',
'Properties': {'Foo': 'abc'}}}} 'Properties': {'Foo': 'abc'}}}}
self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
@ -1168,7 +1149,7 @@ class StackTest(HeatTestCase):
self.assertEqual(self.stack.state, self.assertEqual(self.stack.state,
(parser.Stack.CREATE, parser.Stack.COMPLETE)) (parser.Stack.CREATE, parser.Stack.COMPLETE))
tmpl2 = {'Resources': {'AResource': {'Type': 'GenericResourceType', tmpl2 = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'xyz'}}}} 'Properties': {'Foo': 'xyz'}}}}
updated_stack = parser.Stack(self.ctx, 'updated_stack', updated_stack = parser.Stack(self.ctx, 'updated_stack',
@ -1193,11 +1174,7 @@ class StackTest(HeatTestCase):
@stack_delete_after @stack_delete_after
def test_update_rollback_fail(self): def test_update_rollback_fail(self):
# patch in a dummy property schema for GenericResource tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType',
'Properties': {'Foo': 'abc'}}}} 'Properties': {'Foo': 'abc'}}}}
self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
@ -1212,7 +1189,7 @@ class StackTest(HeatTestCase):
self.assertEqual(self.stack.state, self.assertEqual(self.stack.state,
(parser.Stack.CREATE, parser.Stack.COMPLETE)) (parser.Stack.CREATE, parser.Stack.COMPLETE))
tmpl2 = {'Resources': {'AResource': {'Type': 'GenericResourceType', tmpl2 = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'xyz'}}}} 'Properties': {'Foo': 'xyz'}}}}
updated_stack = parser.Stack(self.ctx, 'updated_stack', updated_stack = parser.Stack(self.ctx, 'updated_stack',
@ -1313,19 +1290,16 @@ class StackTest(HeatTestCase):
changes in dynamic attributes, due to other resources been updated changes in dynamic attributes, due to other resources been updated
are not ignored and can cause dependant resources to be updated. are not ignored and can cause dependant resources to be updated.
''' '''
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Resources': { tmpl = {'Resources': {
'AResource': {'Type': 'GenericResourceType', 'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'abc'}}, 'Properties': {'Foo': 'abc'}},
'BResource': {'Type': 'GenericResourceType', 'BResource': {'Type': 'ResourceWithPropsType',
'Properties': { 'Properties': {
'Foo': {'Ref': 'AResource'}}}}} 'Foo': {'Ref': 'AResource'}}}}}
tmpl2 = {'Resources': { tmpl2 = {'Resources': {
'AResource': {'Type': 'GenericResourceType', 'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'smelly'}}, 'Properties': {'Foo': 'smelly'}},
'BResource': {'Type': 'GenericResourceType', 'BResource': {'Type': 'ResourceWithPropsType',
'Properties': { 'Properties': {
'Foo': {'Ref': 'AResource'}}}}} 'Foo': {'Ref': 'AResource'}}}}}
@ -1372,19 +1346,16 @@ class StackTest(HeatTestCase):
check that rollback still works with dynamic metadata check that rollback still works with dynamic metadata
this test fails the first instance this test fails the first instance
''' '''
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Resources': { tmpl = {'Resources': {
'AResource': {'Type': 'GenericResourceType', 'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'abc'}}, 'Properties': {'Foo': 'abc'}},
'BResource': {'Type': 'GenericResourceType', 'BResource': {'Type': 'ResourceWithPropsType',
'Properties': { 'Properties': {
'Foo': {'Ref': 'AResource'}}}}} 'Foo': {'Ref': 'AResource'}}}}}
tmpl2 = {'Resources': { tmpl2 = {'Resources': {
'AResource': {'Type': 'GenericResourceType', 'AResource': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'smelly'}}, 'Properties': {'Foo': 'smelly'}},
'BResource': {'Type': 'GenericResourceType', 'BResource': {'Type': 'ResourceWithPropsType',
'Properties': { 'Properties': {
'Foo': {'Ref': 'AResource'}}}}} 'Foo': {'Ref': 'AResource'}}}}}
@ -1443,7 +1414,7 @@ class StackTest(HeatTestCase):
this test fails the second instance this test fails the second instance
''' '''
class ResourceTypeA(generic_rsrc.GenericResource): class ResourceTypeA(generic_rsrc.ResourceWithProps):
count = 0 count = 0
def handle_create(self): def handle_create(self):
@ -1452,19 +1423,16 @@ class StackTest(HeatTestCase):
resource._register_class('ResourceTypeA', ResourceTypeA) resource._register_class('ResourceTypeA', ResourceTypeA)
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Resources': { tmpl = {'Resources': {
'AResource': {'Type': 'ResourceTypeA', 'AResource': {'Type': 'ResourceTypeA',
'Properties': {'Foo': 'abc'}}, 'Properties': {'Foo': 'abc'}},
'BResource': {'Type': 'GenericResourceType', 'BResource': {'Type': 'ResourceWithPropsType',
'Properties': { 'Properties': {
'Foo': {'Ref': 'AResource'}}}}} 'Foo': {'Ref': 'AResource'}}}}}
tmpl2 = {'Resources': { tmpl2 = {'Resources': {
'AResource': {'Type': 'ResourceTypeA', 'AResource': {'Type': 'ResourceTypeA',
'Properties': {'Foo': 'smelly'}}, 'Properties': {'Foo': 'smelly'}},
'BResource': {'Type': 'GenericResourceType', 'BResource': {'Type': 'ResourceWithPropsType',
'Properties': { 'Properties': {
'Foo': {'Ref': 'AResource'}}}}} 'Foo': {'Ref': 'AResource'}}}}}

91
heat/tests/test_resource.py
View File

@ -247,23 +247,15 @@ class ResourceTest(HeatTestCase):
update_snippet, tmpl) update_snippet, tmpl)
def test_resource(self): def test_resource(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
self.assertEqual((res.CREATE, res.COMPLETE), res.state) self.assertEqual((res.CREATE, res.COMPLETE), res.state)
def test_create_fail_missing_req_prop(self): def test_create_fail_missing_req_prop(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String', 'Required': True}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {}} tmpl = {'Type': 'GenericResourceType', 'Properties': {}}
rname = 'test_resource' rname = 'test_resource'
res = generic_rsrc.GenericResource(rname, tmpl, self.stack) res = generic_rsrc.ResourceWithRequiredProps(rname, tmpl, self.stack)
estr = 'Property error : test_resource: Property Foo not assigned' estr = 'Property error : test_resource: Property Foo not assigned'
create = scheduler.TaskRunner(res.create) create = scheduler.TaskRunner(res.create)
@ -271,13 +263,9 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.CREATE, res.FAILED), res.state) self.assertEqual((res.CREATE, res.FAILED), res.state)
def test_create_fail_prop_typo(self): def test_create_fail_prop_typo(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String', 'Required': True}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Food': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Food': 'abc'}}
rname = 'test_resource' rname = 'test_resource'
res = generic_rsrc.GenericResource(rname, tmpl, self.stack) res = generic_rsrc.ResourceWithProps(rname, tmpl, self.stack)
estr = 'Property error : test_resource: Property Foo not assigned' estr = 'Property error : test_resource: Property Foo not assigned'
create = scheduler.TaskRunner(res.create) create = scheduler.TaskRunner(res.create)
@ -285,12 +273,8 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.CREATE, res.FAILED), res.state) self.assertEqual((res.CREATE, res.FAILED), res.state)
def test_update_ok(self): def test_update_ok(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
res.update_allowed_keys = ('Properties',) res.update_allowed_keys = ('Properties',)
res.update_allowed_properties = ('Foo',) res.update_allowed_properties = ('Foo',)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
@ -309,12 +293,8 @@ class ResourceTest(HeatTestCase):
self.m.VerifyAll() self.m.VerifyAll()
def test_update_replace(self): def test_update_replace(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
res.update_allowed_keys = ('Properties',) res.update_allowed_keys = ('Properties',)
res.update_allowed_properties = ('Foo',) res.update_allowed_properties = ('Foo',)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
@ -332,12 +312,9 @@ class ResourceTest(HeatTestCase):
self.m.VerifyAll() self.m.VerifyAll()
def test_update_fail_missing_req_prop(self): def test_update_fail_missing_req_prop(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String', 'Required': True}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithRequiredProps('test_resource',
tmpl, self.stack)
res.update_allowed_keys = ('Properties',) res.update_allowed_keys = ('Properties',)
res.update_allowed_properties = ('Foo',) res.update_allowed_properties = ('Foo',)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
@ -349,12 +326,8 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.UPDATE, res.FAILED), res.state) self.assertEqual((res.UPDATE, res.FAILED), res.state)
def test_update_fail_prop_typo(self): def test_update_fail_prop_typo(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
res.update_allowed_keys = ('Properties',) res.update_allowed_keys = ('Properties',)
res.update_allowed_properties = ('Foo',) res.update_allowed_properties = ('Foo',)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
@ -366,12 +339,8 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.UPDATE, res.FAILED), res.state) self.assertEqual((res.UPDATE, res.FAILED), res.state)
def test_update_not_implemented(self): def test_update_not_implemented(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
res.update_allowed_keys = ('Properties',) res.update_allowed_keys = ('Properties',)
res.update_allowed_properties = ('Foo',) res.update_allowed_properties = ('Foo',)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
@ -389,12 +358,8 @@ class ResourceTest(HeatTestCase):
self.m.VerifyAll() self.m.VerifyAll()
def test_suspend_resume_ok(self): def test_suspend_resume_ok(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
res.update_allowed_keys = ('Properties',) res.update_allowed_keys = ('Properties',)
res.update_allowed_properties = ('Foo',) res.update_allowed_properties = ('Foo',)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
@ -405,12 +370,8 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.RESUME, res.COMPLETE), res.state) self.assertEqual((res.RESUME, res.COMPLETE), res.state)
def test_suspend_fail_inprogress(self): def test_suspend_fail_inprogress(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
self.assertEqual((res.CREATE, res.COMPLETE), res.state) self.assertEqual((res.CREATE, res.COMPLETE), res.state)
@ -427,12 +388,8 @@ class ResourceTest(HeatTestCase):
self.assertRaises(exception.ResourceFailure, suspend) self.assertRaises(exception.ResourceFailure, suspend)
def test_resume_fail_not_suspend_complete(self): def test_resume_fail_not_suspend_complete(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
self.assertEqual((res.CREATE, res.COMPLETE), res.state) self.assertEqual((res.CREATE, res.COMPLETE), res.state)
@ -445,12 +402,8 @@ class ResourceTest(HeatTestCase):
self.assertRaises(exception.ResourceFailure, resume) self.assertRaises(exception.ResourceFailure, resume)
def test_suspend_fail_exit(self): def test_suspend_fail_exit(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
self.assertEqual((res.CREATE, res.COMPLETE), res.state) self.assertEqual((res.CREATE, res.COMPLETE), res.state)
@ -464,12 +417,8 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.SUSPEND, res.FAILED), res.state) self.assertEqual((res.SUSPEND, res.FAILED), res.state)
def test_resume_fail_exit(self): def test_resume_fail_exit(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
self.assertEqual((res.CREATE, res.COMPLETE), res.state) self.assertEqual((res.CREATE, res.COMPLETE), res.state)
@ -485,12 +434,8 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.RESUME, res.FAILED), res.state) self.assertEqual((res.RESUME, res.FAILED), res.state)
def test_suspend_fail_exception(self): def test_suspend_fail_exception(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
self.assertEqual((res.CREATE, res.COMPLETE), res.state) self.assertEqual((res.CREATE, res.COMPLETE), res.state)
@ -503,12 +448,8 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.SUSPEND, res.FAILED), res.state) self.assertEqual((res.SUSPEND, res.FAILED), res.state)
def test_resume_fail_exception(self): def test_resume_fail_exception(self):
# patch in a dummy property schema for GenericResource
dummy_schema = {'Foo': {'Type': 'String'}}
generic_rsrc.GenericResource.properties_schema = dummy_schema
tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}} tmpl = {'Type': 'GenericResourceType', 'Properties': {'Foo': 'abc'}}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack)
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
self.assertEqual((res.CREATE, res.COMPLETE), res.state) self.assertEqual((res.CREATE, res.COMPLETE), res.state)