x/vmware-nsx
Code Issues Proposed changes

Merge "NVP plugin: return 409 if wrong router interface info on remove"

Browse Source
This commit is contained in:
Jenkins 2013-03-09 15:31:09 +00:00 committed by Gerrit Code Review
commit 9049b0ac73
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
View File

@ -1769,6 +1769,10 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
port = self._get_port(context, port_id) port = self._get_port(context, port_id)
if port.get('fixed_ips'): if port.get('fixed_ips'):
subnet_id = port['fixed_ips'][0]['subnet_id'] subnet_id = port['fixed_ips'][0]['subnet_id']
if not (port['device_owner'] == l3_db.DEVICE_OWNER_ROUTER_INTF and
port['device_id'] == router_id):
raise l3.RouterInterfaceNotFound(router_id=router_id,
port_id=port_id)
elif 'subnet_id' in interface_info: elif 'subnet_id' in interface_info:
subnet_id = interface_info['subnet_id'] subnet_id = interface_info['subnet_id']
subnet = self._get_subnet(context, subnet_id) subnet = self._get_subnet(context, subnet_id)
@ -1781,6 +1785,9 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
if p['fixed_ips'][0]['subnet_id'] == subnet_id: if p['fixed_ips'][0]['subnet_id'] == subnet_id:
port_id = p['id'] port_id = p['id']
break break
else:
raise l3.RouterInterfaceNotFoundForSubnet(router_id=router_id,
subnet_id=subnet_id)
results = nvplib.query_lswitch_lports( results = nvplib.query_lswitch_lports(
cluster, '*', relations="LogicalPortAttachment", cluster, '*', relations="LogicalPortAttachment",
filters={'tag': port_id, 'tag_scope': 'q_port_id'}) filters={'tag': port_id, 'tag_scope': 'q_port_id'})