x/vmware-nsx
Code Issues Proposed changes

nicira plugin: load subnet once when adding router interface

Browse Source 
Bug 1188562

This patch ensure subnet is loaded only once from the database.
Also, the port is now loaded from the database only if the
corresponding NVP logical port is found.

Change-Id: I1626c7b61ddc8e785d8ce2e39619da78b20ae61e
This commit is contained in:
Salvatore Orlando 2013-06-07 12:33:44 +02:00
parent f83931af80
commit d671bada20
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quantum/plugins/nicira/QuantumPlugin.py
View File

@ -1613,7 +1613,6 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
# The owner of the router port is always the same as the owner of the
# router. Use tenant_id from the port instead of fetching more records
# from the Quantum database
port = self._get_port(context, port_id)
# Find the NVP port corresponding to quantum port_id
results = nvplib.query_lswitch_lports(
self.cluster, '*',
@ -1627,6 +1626,7 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
"backend.") % {'port_id': port_id,
'router_id': router_id}))
port = self._get_port(context, port_id)
# Create logical router port and patch attachment
self._create_and_attach_router_port(
self.cluster, context, router_id, port,
@ -1642,7 +1642,6 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
# In that case we will consider only the first one
if gw_port.get('fixed_ips'):
snat_ip = gw_port['fixed_ips'][0]['ip_address']
subnet = self._get_subnet(context, subnet_id)
cidr_prefix = int(subnet['cidr'].split('/')[1])
nvplib.create_lrouter_snat_rule(
self.cluster, router_id, snat_ip, snat_ip,