Merge "Fix heat-api-cfn 500 error on an unknown action"

2 files changed, 7 insertions, 0 deletions

diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py
index e0e1d2c10..820dd7be1 100644
--- a/heat/api/cfn/v1/stacks.py
+++ b/heat/api/cfn/v1/stacks.py
@@ -48,6 +48,9 @@ class StackController(object):
         self.rpc_client = rpc_client.EngineClient()
         self.policy = policy.Enforcer(scope='cloudformation')
 
+    def default(self, req, **args):
+        raise exception.HeatInvalidActionError()
+
     def _enforce(self, req, action):
         """Authorize an action against the policy.json."""
         try:
diff --git a/heat/tests/api/cfn/test_api_cfn_v1.py b/heat/tests/api/cfn/test_api_cfn_v1.py
index ac7c7afc7..c0fce4f18 100644
--- a/heat/tests/api/cfn/test_api_cfn_v1.py
+++ b/heat/tests/api/cfn/test_api_cfn_v1.py
@@ -62,6 +62,10 @@ class CfnStackControllerTest(common.HeatTestCase):
                                                        'deny_stack_user.json')
         self.addCleanup(self.m.VerifyAll)
 
+    def test_default(self):
+        self.assertRaises(
+            exception.HeatInvalidActionError, self.controller.default, None)
+
     def tearDown(self):
         super(CfnStackControllerTest, self).tearDown()
         cfg.CONF.unregister_opts(self.opts)