Merge "Ignore restricted_actions key"

2 files changed, 23 insertions, 1 deletions

diff --git a/heatclient/common/template_utils.py b/heatclient/common/template_utils.py
index a14f35c..b80878d 100644
--- a/heatclient/common/template_utils.py
+++ b/heatclient/common/template_utils.py
@@ -261,7 +261,7 @@ def resolve_environment_urls(resource_registry, files, env_base_url,
             # Built in providers like: "X::Compute::Server"
             # don't need downloading.
             return True
-        if key == 'hooks':
+        if key in ['hooks', 'restricted_actions']:
             return True
 
     get_file_contents(rr, files, base_url, ignore_if,
diff --git a/heatclient/tests/unit/test_template_utils.py b/heatclient/tests/unit/test_template_utils.py
index 1e1eee9..c99086e 100644
--- a/heatclient/tests/unit/test_template_utils.py
+++ b/heatclient/tests/unit/test_template_utils.py
@@ -52,6 +52,28 @@ class ShellEnvironmentTest(testtools.TestCase):
         if url:
             self.assertEqual(content.decode('utf-8'), files[url])
 
+    def test_ignore_env_keys(self):
+        self.m.StubOutWithMock(request, 'urlopen')
+        env_file = '/home/my/dir/env.yaml'
+        env = b'''
+        resource_registry:
+          resources:
+            bar:
+              hooks: pre_create
+              restricted_actions: replace
+        '''
+        request.urlopen('file://%s' % env_file).AndReturn(
+            six.BytesIO(env))
+        self.m.ReplayAll()
+        _, env_dict = template_utils.process_environment_and_files(
+            env_file)
+        self.assertEqual(
+            {u'resource_registry': {u'resources': {
+                u'bar': {u'hooks': u'pre_create',
+                         u'restricted_actions': u'replace'}}}},
+            env_dict)
+        self.m.VerifyAll()
+
     def test_process_environment_file(self):
 
         self.m.StubOutWithMock(request, 'urlopen')