Merge "Correctly raising MagnumServiceNotFound exception"
This commit is contained in:
commit
02ef5471b2
|
@ -457,7 +457,8 @@ class Connection(api.Connection):
|
||||||
query = add_identity_filter(query, magnum_service_id)
|
query = add_identity_filter(query, magnum_service_id)
|
||||||
count = query.delete()
|
count = query.delete()
|
||||||
if count != 1:
|
if count != 1:
|
||||||
raise exception.MagnumServiceNotFound(magnum_service_id)
|
raise exception.MagnumServiceNotFound(
|
||||||
|
magnum_service_id=magnum_service_id)
|
||||||
|
|
||||||
def update_magnum_service(self, magnum_service_id, values):
|
def update_magnum_service(self, magnum_service_id, values):
|
||||||
session = get_session()
|
session = get_session()
|
||||||
|
@ -467,7 +468,8 @@ class Connection(api.Connection):
|
||||||
try:
|
try:
|
||||||
ref = query.with_lockmode('update').one()
|
ref = query.with_lockmode('update').one()
|
||||||
except NoResultFound:
|
except NoResultFound:
|
||||||
raise exception.MagnumServiceNotFound(magnum_service_id)
|
raise exception.MagnumServiceNotFound(
|
||||||
|
magnum_service_id=magnum_service_id)
|
||||||
|
|
||||||
if 'report_count' in values:
|
if 'report_count' in values:
|
||||||
if values['report_count'] > ref.report_count:
|
if values['report_count'] > ref.report_count:
|
||||||
|
|
Loading…
Reference in New Issue