Merge "Remove unnecessary checks"

heat/api/cfn/v1/stacks.py

@@ -387,10 +387,6 @@ class StackController(object):
         except Exception as ex:
             return exception.map_remote_error(ex)
 
-        if templ is None:
-            msg = _('stack not found')
-            return exception.HeatInvalidParameterValueError(detail=msg)
-
         return api_utils.format_response('GetTemplate',
                                          {'TemplateBody': templ})
 

heat/api/openstack/v1/stacks.py

@@ -447,9 +447,6 @@ class StackController(object):
         templ = self.rpc_client.get_template(req.context,
                                              identity)
 
-        if templ is None:
-            raise exc.HTTPNotFound()
-
         # TODO(zaneb): always set Content-type to application/json
         return templ
 
@@ -458,9 +455,6 @@ class StackController(object):
         """Get the environment for an existing stack."""
         env = self.rpc_client.get_environment(req.context, identity)
 
-        if env is None:
-            raise exc.HTTPNotFound()
-
         return env
 
     @util.identified_stack
@@ -558,13 +552,9 @@ class StackController(object):
     def delete(self, req, identity):
         """Delete the specified stack."""
 
-        res = self.rpc_client.delete_stack(req.context,
-                                           identity,
-                                           cast=False)
-
-        if res is not None:
-            raise exc.HTTPBadRequest(res['Error'])
-
+        self.rpc_client.delete_stack(req.context,
+                                     identity,
+                                     cast=False)
         raise exc.HTTPNoContent()
 
     @util.identified_stack

heat/engine/service.py

@@ -1279,9 +1279,7 @@ class EngineService(service.Service):
         :param stack_identity: Name of the stack you want to see.
         """
         s = self._get_stack(cnxt, stack_identity, show_deleted=True)
-        if s:
-            return s.raw_template.template
-        return None
+        return s.raw_template.template
 
     @context.request_context
     def get_environment(self, cnxt, stack_identity):
@@ -1292,9 +1290,7 @@ class EngineService(service.Service):
         :rtype: dict
         """
         s = self._get_stack(cnxt, stack_identity, show_deleted=True)
-        if s:
-            return s.raw_template.environment
-        return None
+        return s.raw_template.environment
 
     @context.request_context
     def get_files(self, cnxt, stack_identity):
@@ -1415,7 +1411,7 @@ class EngineService(service.Service):
 
         self.thread_group_mgr.start_with_lock(cnxt, stack, self.engine_id,
                                               stack.delete)
-        return None
+        return
 
     @context.request_context
     def export_stack(self, cnxt, stack_identity):

heat/tests/api/cfn/test_api_cfn_v1.py

@@ -1031,31 +1031,6 @@ class CfnStackControllerTest(common.HeatTestCase):
         result = self.controller.get_template(dummy_req)
         self.assertIsInstance(result, exception.HeatInvalidParameterValueError)
 
-    def test_get_template_err_none(self):
-        stack_name = "wordpress"
-        identity = dict(identifier.HeatIdentifier('t', stack_name, '6'))
-        params = {'Action': 'GetTemplate', 'StackName': stack_name}
-        dummy_req = self._dummy_GET_request(params)
-        self._stub_enforce(dummy_req, 'GetTemplate')
-
-        # Stub out the RPC call to the engine to return None
-        # this test the "no such stack" error path
-        engine_resp = None
-
-        self.m.StubOutWithMock(rpc_client.EngineClient, 'call')
-        rpc_client.EngineClient.call(
-            dummy_req.context, ('identify_stack', {'stack_name': stack_name})
-        ).AndReturn(identity)
-        rpc_client.EngineClient.call(
-            dummy_req.context, ('get_template', {'stack_identity': identity})
-        ).AndReturn(engine_resp)
-
-        self.m.ReplayAll()
-
-        result = self.controller.get_template(dummy_req)
-
-        self.assertIsInstance(result, exception.HeatInvalidParameterValueError)
-
     def test_validate_err_no_template(self):
         # Format a dummy request with a missing template field
         params = {'Action': 'ValidateTemplate'}

heat/tests/api/openstack_v1/test_stacks.py

@@ -1723,28 +1723,6 @@ class StackControllerTest(tools.ControllerTest, common.HeatTestCase):
         self.assertEqual(env, response)
         self.m.VerifyAll()
 
-    def test_get_environment_no_env(self, mock_enforce):
-        self._mock_enforce_setup(mock_enforce, 'environment', True)
-        identity = identifier.HeatIdentifier(self.tenant, 'wordpress', '6')
-        req = self._get('/stacks/%(stack_name)s/%(stack_id)s' % identity)
-
-        self.m.StubOutWithMock(rpc_client.EngineClient, 'call')
-        rpc_client.EngineClient.call(
-            req.context,
-            ('get_environment', {'stack_identity': dict(identity)},),
-            version='1.28',
-        ).AndReturn(None)
-        self.m.ReplayAll()
-
-        self.assertRaises(webob.exc.HTTPNotFound,
-                          self.controller.environment,
-                          req,
-                          tenant_id=identity.tenant,
-                          stack_name=identity.stack_name,
-                          stack_id=identity.stack_id)
-
-        self.m.VerifyAll()
-
     def test_get_files(self, mock_enforce):
         self._mock_enforce_setup(mock_enforce, 'files', True)
         identity = identifier.HeatIdentifier(self.tenant, 'wordpress', '6')