Browse Source

Merge "Support gateway which is not in subnet CIDR in ha_router" into stable/queens

changes/49/763349/1
Zuul 5 months ago
committed by Gerrit Code Review
parent
commit
8077d16ce8
2 changed files with 13 additions and 0 deletions
  1. +9
    -0
      neutron/agent/l3/ha_router.py
  2. +4
    -0
      neutron/tests/unit/agent/l3/test_ha_router.py

+ 9
- 0
neutron/agent/l3/ha_router.py View File

@ -29,6 +29,7 @@ from neutron.agent.linux import ip_lib
from neutron.agent.linux import keepalived
from neutron.common import constants as const
from neutron.common import utils as common_utils
from neutron.ipam import utils as ipam_utils
LOG = logging.getLogger(__name__)
HA_DEV_PREFIX = 'ha-'
@ -265,6 +266,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
- 0
neutron/tests/unit/agent/l3/test_ha_router.py View File

@ -76,6 +76,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