Assert on Resource double-create()

There's no valid case in which we should be creating a resource multiple
times.

Change-Id: Id90edd3a09ec15d3814a322ac0b7ec75fd0be54a

diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index 92aabe6db5e0772a2c954229233df937926267ae..bd63cf5b0f693807787e1e59912df54c5c739147 100644 (file)
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -299,8 +299,7 @@ class Resource(object):
         Create the resource. Subclasses should provide a handle_create() method
         to customise creation.
         '''
-        if self.state in (self.CREATE_IN_PROGRESS, self.CREATE_COMPLETE):
-            return 'Resource creation already requested'
+        assert self.state is None, 'Resource create requested in invalid state'
 
         logger.info('creating %s' % str(self))
 

diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py
index 3b8b40a6f90ab6f0eb9a9e69119d625437314173..1cc916acd05e0933ce96ed2cee7462e74e561986 100644 (file)
--- a/heat/tests/test_loadbalancer.py
+++ b/heat/tests/test_loadbalancer.py
@@ -154,8 +154,6 @@ class LoadBalancerTest(unittest.TestCase):
                                      s)
             id_list.append(inst.FnGetRefId())
 
-        resource.nested().create()
-
         resource.reload(id_list)
 
         self.assertEqual('4.5.6.7', resource.FnGetAtt('DNSName'))