Merge "Allow selectively disabling resource validation"

1 files changed, 16 insertions, 0 deletions

diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index da2293fdb..9e80c190f 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -1080,8 +1080,24 @@ class Resource(object):
         return name[0:2] + '-' + name[-postfix_length:]
 
     def validate(self):
+        '''
+        Validate the resource.
+
+        This may be overridden by resource plugins to add extra
+        validation logic specific to the resource implementation.
+        '''
         LOG.info(_LI('Validating %s'), six.text_type(self))
+        return self.validate_template()
 
+    def validate_template(self):
+        '''
+        Validate strucural/syntax aspects of the resource definition.
+
+        Resource plugins should not override this, because this interface
+        is expected to be called pre-create so things normally valid
+        in an overridden validate() such as accessing properties
+        may not work.
+        '''
         function.validate(self.t)
         self.validate_deletion_policy(self.t.deletion_policy())
         self.t.update_policy(self.update_policy_schema,