x/vmware-nsx
Code Issues Proposed changes

Merge "Fix error while connecting to busy NSX L2 Gateway"

Browse Source
This commit is contained in:
Jenkins 2014-02-11 02:41:17 +00:00 committed by Gerrit Code Review
commit 3dec917a8f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2009,8 +2009,11 @@ class NvpPluginV2(addr_pair_db.AllowedAddressPairsMixin,
network_mapping_info): network_mapping_info):
# Ensure the default gateway in the config file is in sync with the db # Ensure the default gateway in the config file is in sync with the db
self._ensure_default_network_gateway() self._ensure_default_network_gateway()
return super(NvpPluginV2, self).connect_network( try:
context, network_gateway_id, network_mapping_info) return super(NvpPluginV2, self).connect_network(
context, network_gateway_id, network_mapping_info)
except NvpApiClient.Conflict:
raise nvp_exc.NvpL2GatewayAlreadyInUse(gateway=network_gateway_id)
def disconnect_network(self, context, network_gateway_id, def disconnect_network(self, context, network_gateway_id,
network_mapping_info): network_mapping_info):