Catch InvalidInput in DHCP port actions
The exception handler checking for concurrently deleted subnets was missing InvalidInput, which comes from IPAM when a port creation request references a subnet that doesn't exist. This patch just catches that exception. Change-Id: I14f9e4bddde845e3fef2b0d8649d3954ba5c93bd Closes-Bug: #1618187
This commit is contained in:
parent
79927038bc
commit
c05751a556
|
@ -104,6 +104,7 @@ class DhcpRpcCallback(object):
|
|||
except (db_exc.DBError,
|
||||
exceptions.NetworkNotFound,
|
||||
exceptions.SubnetNotFound,
|
||||
exceptions.InvalidInput,
|
||||
exceptions.IpAddressGenerationFailure) as e:
|
||||
with excutils.save_and_reraise_exception(reraise=False) as ctxt:
|
||||
if isinstance(e, exceptions.IpAddressGenerationFailure):
|
||||
|
|
|
@ -157,6 +157,9 @@ class TestDhcpRpcCallback(base.BaseTestCase):
|
|||
self._test__port_action_with_failures(
|
||||
exc=n_exc.IpAddressGenerationFailure(net_id='foo_network_id'),
|
||||
action='create_port')
|
||||
self._test__port_action_with_failures(
|
||||
exc=n_exc.InvalidInput(error_message='sorry'),
|
||||
action='create_port')
|
||||
|
||||
def test_get_network_info_return_none_on_not_found(self):
|
||||
self.plugin.get_network.side_effect = n_exc.NetworkNotFound(net_id='a')
|
||||
|
|
Loading…
Reference in New Issue