Merge "Allow only validate external resource template" into stable/ocata

2 files changed, 22 insertions, 0 deletions

diff --git a/heat/engine/stack.py b/heat/engine/stack.py
index 9a269e176..3f8fbc7be 100644
--- a/heat/engine/stack.py
+++ b/heat/engine/stack.py
@@ -845,6 +845,7 @@ class Stack(collections.Mapping):
             # Don't validate identical definitions multiple times
             if res.name not in unique_defn_names:
                 continue
+            result = None
             try:
                 if self.resource_validate:
                     if res.external_id is not None:
diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py
index 0fc53feb3..51b505387 100644
--- a/heat/tests/test_validate.py
+++ b/heat/tests/test_validate.py
@@ -899,6 +899,16 @@ outputs:
 '''
 
 
+test_template_external_rsrc = '''
+heat_template_version: ocata
+
+resources:
+  random_str:
+    type: OS::Nova::Server
+    external_id: foobar
+'''
+
+
 class ValidateTest(common.HeatTestCase):
     def setUp(self):
         super(ValidateTest, self).setUp()
@@ -1746,3 +1756,14 @@ class ValidateTest(common.HeatTestCase):
         ex = webob.exc.HTTPBadRequest(explanation=msg)
         self.assertIsInstance(res, webob.exc.HTTPBadRequest)
         self.assertEqual(ex.explanation, res.explanation)
+
+    def test_validate_allowed_external_rsrc(self):
+        t = template_format.parse(test_template_external_rsrc)
+        template = tmpl.Template(t)
+        stack = parser.Stack(self.ctx, 'test_stack', template)
+
+        with mock.patch(
+            'heat.engine.resources.server_base.BaseServer._show_resource',
+            return_value={'id': 'foobar'}
+        ):
+            self.assertIsNone(stack.validate())