x/vmware-nsx
Code Issues Proposed changes

Merge "pass default l3_gateway_service_uuid if not specified"

Browse Source
This commit is contained in:
Jenkins
2013-09-12 23:27:57 +00:00
committed by Gerrit Code Review
parent 497a9a684a 8372bbac08
commit 409e92fce3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/plugins/nicira/NeutronPlugin.py
View File

@@ -622,11 +622,13 @@ class NvpPluginV2(addr_pair_db.AllowedAddressPairsMixin,
ext_network = self.get_network(context, port_data['network_id']) ext_network = self.get_network(context, port_data['network_id'])
if ext_network.get(pnet.NETWORK_TYPE) == NetworkTypes.L3_EXT: if ext_network.get(pnet.NETWORK_TYPE) == NetworkTypes.L3_EXT:
# Update attachment # Update attachment
physical_network = (ext_network[pnet.PHYSICAL_NETWORK] or
self.cluster.default_l3_gw_service_uuid)
self._update_router_port_attachment( self._update_router_port_attachment(
self.cluster, context, router_id, port_data, self.cluster, context, router_id, port_data,
lr_port['uuid'], lr_port['uuid'],
"L3GatewayAttachment", "L3GatewayAttachment",
ext_network[pnet.PHYSICAL_NETWORK], physical_network,
ext_network[pnet.SEGMENTATION_ID]) ext_network[pnet.SEGMENTATION_ID])
LOG.debug(_("_nvp_create_ext_gw_port completed on external network " LOG.debug(_("_nvp_create_ext_gw_port completed on external network "