Don't raise ResourceFailure directly in Instance

It's meant to be a wrapper around other exceptions that's invoked by
top-level resource operations; don't use it as an all-purpose exception.

Change-Id: I295202bca603006a4d5f5d56110fc4298ddd9cec

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index e4b32c7b27068e00924fd6484713833e746150f6..2b2376a0dea6f9aeaa0865281244adac963af9b6 100644 (file)
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -327,12 +327,12 @@ class Instance(resource.Resource):
                 delete(wait_time=0.2)
                 exc = exception.Error("Build of server %s failed." %
                                       server.name)
-                raise exception.ResourceFailure(exc, self)
+                raise exc
             else:
                 exc = exception.Error('%s instance[%s] status[%s]' %
                                       ('nova reported unexpected',
                                        self.name, server.status))
-                raise exception.ResourceFailure(exc, self)
+                raise exc
         else:
             return volume_attach.step()
 

diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py
index c43709067f3e2c69934308fb56a6f3c31b3b5c3b..bb8f0312680e2caa099f97e2b322e0fcf78be4da 100644 (file)
--- a/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@ -216,7 +216,7 @@ class InstancesTest(HeatTestCase):
                                               'test_instance_create')
         return_server.get = lambda: None
         return_server.status = 'BOGUS'
-        self.assertRaises(exception.ResourceFailure,
+        self.assertRaises(exception.Error,
                           instance.check_create_complete,
                           (return_server, self.FakeVolumeAttach()))
 
@@ -231,7 +231,7 @@ class InstancesTest(HeatTestCase):
             clients.novaclient.exceptions.NotFound('test'))
         self.m.ReplayAll()
 
-        self.assertRaises(exception.ResourceFailure,
+        self.assertRaises(exception.Error,
                           instance.check_create_complete,
                           (return_server, self.FakeVolumeAttach()))