x/vmware-nsx
Code Issues Proposed changes

Fix usage of SQLAlchemy Query.first() method

Browse Source 
Query.first() doesn't raise the NoResultFound exception
if no result is found but rather returns None, so wrapping
of Query.first() call into a try/except NoResultFound block
is useless.

Fixes bug 1177842.

Change-Id: I0bd0e6d8299734b485dd1a1ac36bf6c295fd8932
This commit is contained in:
Roman Podolyaka 2013-05-08 18:34:51 +03:00
parent f8f2a7f39c
commit 6d26dd5768
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
quantum/plugins/nicira/nicira_qos_db.py
View File

@ -132,16 +132,10 @@ class NVPQoSDbMixin(ext_qos.QueuePluginBase):
def _delete_network_queue_mapping(self, context, network_id):
query = self._model_query(context, NetworkQueueMapping)
try:
with context.session.begin(subtransactions=True):
binding = query.filter_by(network_id=network_id).first()
if binding:
context.session.delete(binding)
except exc.NoResultFound:
# return since this can happen if we are updating a port that
# did not already have a queue on it. There is no need to check
# if there is one before deleting if we return here.
return
with context.session.begin(subtransactions=True):
binding = query.filter_by(network_id=network_id).first()
if binding:
context.session.delete(binding)
def _extend_port_qos_queue(self, context, port):
if self._check_view_auth(context, {'qos_queue': None},