Merge "Don't allow deletion of the router ports without IP addresses"
This commit is contained in:
commit
1485b69824
|
@ -1745,15 +1745,6 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
|
||||||
return
|
return
|
||||||
if port['device_owner'] not in self.router_device_owners:
|
if port['device_owner'] not in self.router_device_owners:
|
||||||
return
|
return
|
||||||
# Raise port in use only if the port has IP addresses
|
|
||||||
# Otherwise it's a stale port that can be removed
|
|
||||||
fixed_ips = port['fixed_ips']
|
|
||||||
if not fixed_ips:
|
|
||||||
LOG.debug("Port %(port_id)s has owner %(port_owner)s, but "
|
|
||||||
"no IP address, so it can be deleted",
|
|
||||||
{'port_id': port['id'],
|
|
||||||
'port_owner': port['device_owner']})
|
|
||||||
return
|
|
||||||
# NOTE(kevinbenton): we also check to make sure that the
|
# NOTE(kevinbenton): we also check to make sure that the
|
||||||
# router still exists. It's possible for HA router interfaces
|
# router still exists. It's possible for HA router interfaces
|
||||||
# to remain after the router is deleted if they encounter an
|
# to remain after the router is deleted if they encounter an
|
||||||
|
|
|
@ -269,9 +269,10 @@ class TestL3_NAT_dbonly_mixin(
|
||||||
# without fixed IPs is allowed
|
# without fixed IPs is allowed
|
||||||
gp.return_value.get_port.return_value = {
|
gp.return_value.get_port.return_value = {
|
||||||
'device_owner': n_const.DEVICE_OWNER_ROUTER_INTF, 'fixed_ips': [],
|
'device_owner': n_const.DEVICE_OWNER_ROUTER_INTF, 'fixed_ips': [],
|
||||||
'id': 'f'
|
'device_id': '44', 'id': 'f',
|
||||||
}
|
}
|
||||||
self.db.prevent_l3_port_deletion(None, None)
|
with testtools.ExpectedException(n_exc.ServicePortInUse):
|
||||||
|
self.db.prevent_l3_port_deletion(mock.Mock(), None)
|
||||||
|
|
||||||
@mock.patch.object(directory, 'get_plugin')
|
@mock.patch.object(directory, 'get_plugin')
|
||||||
def test_prevent_l3_port_no_router(self, gp):
|
def test_prevent_l3_port_no_router(self, gp):
|
||||||
|
|
Loading…
Reference in New Issue