heat engine : remove unused validate_template params

Remove unused params argument to validate_template, since
it is no longer passed by the CFN API meaning the validate
action fails

Fixes #262

Change-Id: Ic2a5ede02649f2d6dff86595efb0127e07fbf253
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/heat/api/openstack/v1/stacks.py b/heat/api/openstack/v1/stacks.py
index 9b5fbc65da5bc37b08bb3bbec1656796c47b54df..fe493394fdfa2c5a625041d3511f05ee4731000f 100644 (file)
--- a/heat/api/openstack/v1/stacks.py
+++ b/heat/api/openstack/v1/stacks.py
@@ -361,8 +361,7 @@ class StackController(object):
 
         try:
             result = self.engine_rpcapi.validate_template(req.context,
-                                                          data.template(),
-                                                          data.user_params())
+                                                          data.template())
         except rpc_common.RemoteError as ex:
             return self._remote_error(ex, True)
 

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 62e8d0d0b81a1a7d16d5944bec5a0cdb7e6e6899..88fea7b7939651a4b0f0a7a9999905e77b3b54a1 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -180,7 +180,7 @@ class EngineManager(manager.Manager):
 
         return dict(current_stack.identifier())
 
-    def validate_template(self, context, template, params):
+    def validate_template(self, context, template):
         """
         The validate_template method uses the stack parser to check
         the validity of a template.

diff --git a/heat/engine/rpcapi.py b/heat/engine/rpcapi.py
index 7d0185f190893670219fcbdff1782ebf03d52e62..ce409f4cd2dc1ff9b55ba838ebe7d210381ebd6e 100644 (file)
--- a/heat/engine/rpcapi.py
+++ b/heat/engine/rpcapi.py
@@ -121,7 +121,7 @@ class EngineAPI(heat.openstack.common.rpc.proxy.RpcProxy):
                                              params=params, args=args),
                          topic=_engine_topic(self.topic, ctxt, None))
 
-    def validate_template(self, ctxt, template, params):
+    def validate_template(self, ctxt, template):
         """
         The validate_template method uses the stack parser to check
         the validity of a template.
@@ -131,7 +131,7 @@ class EngineAPI(heat.openstack.common.rpc.proxy.RpcProxy):
         :param params: Params passed from API.
         """
         return self.call(ctxt, self.make_msg('validate_template',
-                                             template=template, params=params),
+                                             template=template),
                          topic=_engine_topic(self.topic, ctxt, None))
 
     def get_template(self, ctxt, stack_identity):

diff --git a/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py
index eafeb06c1f58840dde094561b86221cecc9a03a1..d7a7fa60974a0918a6ab79220b0ca4340948d0ad 100644 (file)
--- a/heat/tests/test_api_openstack_v1.py
+++ b/heat/tests/test_api_openstack_v1.py
@@ -670,9 +670,7 @@ class StackControllerTest(unittest.TestCase):
     def test_validate_template(self):
         template = {u'Foo': u'bar'}
         json_template = json.dumps(template)
-        parameters = {u'InstanceType': u'm1.xlarge'}
-        body = {'template': template,
-                'parameters': parameters}
+        body = {'template': template}
 
         req = self._post('/validate', json.dumps(body))
 
@@ -693,8 +691,7 @@ class StackControllerTest(unittest.TestCase):
         self.m.StubOutWithMock(rpc, 'call')
         rpc.call(req.context, self.topic,
                  {'method': 'validate_template',
-                  'args': {'template': template,
-                           'params': parameters},
+                  'args': {'template': template},
                   'version': self.api_version},
                  None).AndReturn(engine_response)
         self.m.ReplayAll()
@@ -708,17 +705,14 @@ class StackControllerTest(unittest.TestCase):
     def test_validate_template_error(self):
         template = {u'Foo': u'bar'}
         json_template = json.dumps(template)
-        parameters = {u'InstanceType': u'm1.xlarge'}
-        body = {'template': template,
-                'parameters': parameters}
+        body = {'template': template}
 
         req = self._post('/validate', json.dumps(body))
 
         self.m.StubOutWithMock(rpc, 'call')
         rpc.call(req.context, self.topic,
                  {'method': 'validate_template',
-                  'args': {'template': template,
-                           'params': parameters},
+                  'args': {'template': template},
                   'version': self.api_version},
                  None).AndReturn({'Error': 'fubar'})
         self.m.ReplayAll()

diff --git a/heat/tests/test_rpcapi.py b/heat/tests/test_rpcapi.py
index 6fc8cce6a0a016519db988def35b8e3935b1e9a2..38a38eda3108dbcd5f6d807aedc391ccd7c52a3e 100644 (file)
--- a/heat/tests/test_rpcapi.py
+++ b/heat/tests/test_rpcapi.py
@@ -104,7 +104,7 @@ class EngineRpcAPITestCase(unittest.TestCase):
 
     def test_validate_template(self):
         self._test_engine_api('validate_template', 'call',
-                              template={u'Foo': u'bar'}, params={})
+                              template={u'Foo': u'bar'})
 
     def test_get_template(self):
         self._test_engine_api('get_template', 'call',

diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py
index 975e508244b6c7c73c25fa8ed97614020500b42f..38a54168f7818ef750d067eb32373de4691c419d 100644 (file)
--- a/heat/tests/test_validate.py
+++ b/heat/tests/test_validate.py
@@ -267,7 +267,7 @@ class validateTest(unittest.TestCase):
 
         manager = managers.EngineManager()
         res = dict(manager.
-            validate_template(None, t, params)['ValidateTemplateResult'])
+            validate_template(None, t)['ValidateTemplateResult'])
         print 'res %s' % res
         self.assertEqual(res['Description'], 'test.')
 
@@ -284,7 +284,7 @@ class validateTest(unittest.TestCase):
 
         manager = managers.EngineManager()
         res = dict(manager.
-            validate_template(None, t, params)['ValidateTemplateResult'])
+            validate_template(None, t)['ValidateTemplateResult'])
         self.assertNotEqual(res['Description'], 'Successfully validated')
 
     def test_validate_findinmap_valid(self):
@@ -300,7 +300,7 @@ class validateTest(unittest.TestCase):
 
         manager = managers.EngineManager()
         res = dict(manager.
-            validate_template(None, t, params)['ValidateTemplateResult'])
+            validate_template(None, t)['ValidateTemplateResult'])
         self.assertEqual(res['Description'], 'test.')
 
     def test_validate_findinmap_invalid(self):
@@ -316,7 +316,7 @@ class validateTest(unittest.TestCase):
 
         manager = managers.EngineManager()
         res = dict(manager.
-            validate_template(None, t, params)['ValidateTemplateResult'])
+            validate_template(None, t)['ValidateTemplateResult'])
         self.assertNotEqual(res['Description'], 'Successfully validated')
 
     # allows testing of the test directly, shown below