openstack
/
neutron
Code Issues Proposed changes

Fix error while connecting to busy NSX L2 Gateway 

Ensure that a Conflict error is properly handled.

Change-Id: Ib468ee953aef0fc54ea88064f88637ed46bc6352
Closes-bug: 1270724
This commit is contained in:
armando-migliaccio 2014-01-27 14:05:12 -08:00
parent b78eea6146
commit 7ee1344c47
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

@ -2028,8 +2028,11 @@ class NvpPluginV2(addr_pair_db.AllowedAddressPairsMixin,
network_mapping_info):
# Ensure the default gateway in the config file is in sync with the db
self._ensure_default_network_gateway()
return super(NvpPluginV2, self).connect_network(
context, network_gateway_id, network_mapping_info)
try:
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,
network_mapping_info):