openstack
/
magnum
Code Issues Proposed changes

Merge "Correctly raising MagnumServiceNotFound exception"

This commit is contained in:
Jenkins 2016-09-06 20:58:23 +00:00 committed by Gerrit Code Review
parent a1a64da2cd b60c447d91
commit 02ef5471b2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
magnum/db/sqlalchemy/api.py
View File

@ -457,7 +457,8 @@ class Connection(api.Connection):
query = add_identity_filter(query, magnum_service_id)
count = query.delete()
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):
session = get_session()
@ -467,7 +468,8 @@ class Connection(api.Connection):
try:
ref = query.with_lockmode('update').one()
except NoResultFound:
raise exception.MagnumServiceNotFound(magnum_service_id)
raise exception.MagnumServiceNotFound(
magnum_service_id=magnum_service_id)
if 'report_count' in values:
if values['report_count'] > ref.report_count: