Merge "Use EntityNotFound instead of ServiceNotFound"
This commit is contained in:
commit
43ca997198
@ -403,10 +403,6 @@ class EventSendFailed(HeatException):
|
||||
"on other engine (%(engine_id)s)")
|
||||
|
||||
|
||||
class ServiceNotFound(HeatException):
|
||||
msg_fmt = _("Service %(service_id)s not found")
|
||||
|
||||
|
||||
class UnsupportedObjectError(HeatException):
|
||||
msg_fmt = _('Unsupported object type %(objtype)s')
|
||||
|
||||
|
@ -1020,7 +1020,7 @@ def service_delete(context, service_id, soft_delete=True):
|
||||
def service_get(context, service_id):
|
||||
result = model_query(context, models.Service).get(service_id)
|
||||
if result is None:
|
||||
raise exception.ServiceNotFound(service_id=service_id)
|
||||
raise exception.EntityNotFound(entity='Service', name=service_id)
|
||||
return result
|
||||
|
||||
|
||||
|
@ -2500,8 +2500,9 @@ class DBAPIServiceTest(common.HeatTestCase):
|
||||
|
||||
# Delete
|
||||
db_api.service_delete(self.ctx, service.id, False)
|
||||
self.assertRaises(exception.ServiceNotFound, db_api.service_get,
|
||||
ex = self.assertRaises(exception.EntityNotFound, db_api.service_get,
|
||||
self.ctx, service.id)
|
||||
self.assertEqual('Service', ex.kwargs.get('entity'))
|
||||
|
||||
|
||||
class DBAPIResourceUpdateTest(common.HeatTestCase):
|
||||
|
Loading…
Reference in New Issue
Block a user