From 40ed0ade378bb0289c546e7c2cc16891275c3e2b Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Mon, 12 Nov 2012 17:42:36 +0100 Subject: [PATCH] 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 --- heat/engine/resources/resource.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/heat/engine/resources/resource.py b/heat/engine/resources/resource.py index 7a341166..54d6ac24 100644 --- 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: -- 2.45.2