Actually validate properties of resources

Properties.validate() returns an error on failure; it does not raise an
exception (and never has). So we should look at the return value when we
call it.

Change-Id: Iaa0deb9f54055b4b1f73c0b37d26f5ac2c00d683
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/engine/resources/resource.py b/heat/engine/resources/resource.py
index 7a3411669e9807467e5260c61d47a60f47f34098..54d6ac2425d5242850d94e285d60c244e63c04c4 100644 (file)
--- a/heat/engine/resources/resource.py
+++ b/heat/engine/resources/resource.py
@@ -188,7 +188,9 @@ class Resource(object):
         logger.info('creating %s' % str(self))
 
         try:
-            self.properties.validate()
+            err = self.properties.validate()
+            if err:
+                return err
             self.state_set(self.CREATE_IN_PROGRESS)
             if callable(getattr(self, 'handle_create', None)):
                 self.handle_create()
@@ -216,7 +218,9 @@ class Resource(object):
         try:
             self.state_set(self.UPDATE_IN_PROGRESS)
             self.t = self.stack.resolve_static_data(json_snippet)
-            self.properties.validate()
+            err = self.properties.validate()
+            if err:
+                return err
             if callable(getattr(self, 'handle_update', None)):
                 result = self.handle_update()
         except Exception as ex: