From 102e4c17e39cdbadcb99a696d05426b26b503d47 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Mon, 12 Aug 2013 10:50:57 +0200 Subject: [PATCH] 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 --- heat/engine/resources/instance.py | 4 ++-- heat/tests/test_instance.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py index e4b32c7b..2b2376a0 100644 --- 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 c4370906..bb8f0312 100644 --- 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())) -- 2.45.2