openstack/neutron-vpnaas
Code Issues Proposed changes

Merge "Fix for bug 902175"

Browse Source
This commit is contained in:
Jenkins 2011-12-14 00:38:01 +00:00 committed by Gerrit Code Review
commit 8c53e3b726
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

@ -160,12 +160,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()
@ -223,9 +224,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()