Browse Source

Support gateway which is not in subnet CIDR in ha_router

There is case that gateway is not in subnet CIDR.
We can set 2 routes as follows to support this:
ip route add 172.16.0.1/32 dev eth0
ip route add default via 172.16.0.1 dev eth0

Closes-bug: #1861674
Change-Id: I69356e926b15de7f1f99540e7cb98671c634e8a9
changes/41/705441/7
jufeng 2 years ago
committed by LIU Yulong
parent
commit
554b5c2267
  1. 9
      neutron/agent/l3/ha_router.py
  2. 4
      neutron/tests/unit/agent/l3/test_ha_router.py

9
neutron/agent/l3/ha_router.py

@ -30,6 +30,7 @@ from neutron.agent.linux import keepalived
from neutron.common import utils as common_utils
from neutron.extensions import revisions
from neutron.extensions import timestamp
from neutron.ipam import utils as ipam_utils
LOG = logging.getLogger(__name__)
HA_DEV_PREFIX = 'ha-'
@ -271,6 +272,14 @@ class HaRouter(router.RouterInfo):
default_gw_rts = []
instance = self._get_keepalived_instance()
for subnet in ex_gw_port.get('subnets', []):
is_gateway_not_in_subnet = (subnet['gateway_ip'] and
not ipam_utils.check_subnet_ip(
subnet['cidr'],
subnet['gateway_ip']))
if is_gateway_not_in_subnet:
default_gw_rts.append(keepalived.KeepalivedVirtualRoute(
subnet['gateway_ip'], None, interface_name, scope='link'))
for gw_ip in gateway_ips:
# TODO(Carl) This is repeated everywhere. A method would
# be nice.

4
neutron/tests/unit/agent/l3/test_ha_router.py

@ -84,6 +84,10 @@ class TestBasicRouterOperations(base.BaseTestCase):
ri._add_default_gw_virtual_route(ex_gw_port, 'qg-abc')
self.assertEqual(0, len(mock_instance.virtual_routes.gateway_routes))
subnets[1]['gateway_ip'] = '30.0.1.1'
ri._add_default_gw_virtual_route(ex_gw_port, 'qg-abc')
self.assertEqual(2, len(mock_instance.virtual_routes.gateway_routes))
@mock.patch.object(router_info.RouterInfo, 'remove_floating_ip')
def test_remove_floating_ip(self, super_remove_floating_ip):
ri = self._create_router(mock.MagicMock())

Loading…
Cancel
Save