From 7ee1344c474b73dd2236d2c79df8dcf49cdb7bef Mon Sep 17 00:00:00 2001 From: armando-migliaccio Date: Mon, 27 Jan 2014 14:05:12 -0800 Subject: [PATCH] Fix error while connecting to busy NSX L2 Gateway Ensure that a Conflict error is properly handled. Change-Id: Ib468ee953aef0fc54ea88064f88637ed46bc6352 Closes-bug: 1270724 --- neutron/plugins/nicira/NeutronPlugin.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neutron/plugins/nicira/NeutronPlugin.py b/neutron/plugins/nicira/NeutronPlugin.py index a44b73d8df2..f278e1369ad 100644 --- a/neutron/plugins/nicira/NeutronPlugin.py +++ b/neutron/plugins/nicira/NeutronPlugin.py @@ -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):