x/vmware-nsx
Code Issues Proposed changes

Fix for bug 902175

Browse Source 
We can't use merge if we're removing a field from the port object so use add
instead.  Also, pass the session to port_get so that we don't run into the
"this port is already bound to session x" error.

Change-Id: I54a8484c8f6429ad18fb0c5e088720d21fc16299
This commit is contained in:
Brad Hall 2011-12-12 18:26:21 +00:00
parent 5c8fed5076
commit 0ab325f669
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
quantum/db/api.py
View File

@ -159,12 +159,13 @@ def port_list(net_id):
all()
def port_get(port_id, net_id):
def port_get(port_id, net_id, session=None):
# confirm network exists
network_get(net_id)
session = get_session()
if not session:
session = get_session()
try:
return session.query(models.Port).\
return session.query(models.Port).\
filter_by(uuid=port_id).\
filter_by(network_id=net_id).\
one()
@ -222,9 +223,9 @@ def port_unset_attachment(port_id, net_id):
network_get(net_id)
session = get_session()
port = port_get(port_id, net_id)
port = port_get(port_id, net_id, session)
port.interface_id = None
session.merge(port)
session.add(port)
session.flush()