openstack/neutron
Code Issues Proposed changes

Merge "l3 ha: don't send routers without '_ha_interface'"

Browse Source
This commit is contained in:
Jenkins 2016-09-07 05:35:02 +00:00 committed by Gerrit Code Review
commit 750fdb7b22
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/db/l3_hamode_db.py
View File

@ -689,7 +689,7 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
None)
@log_helpers.log_method_call
def _process_sync_ha_data(self, context, routers, host):
def _process_sync_ha_data(self, context, routers, host, agent_mode):
routers_dict = dict((router['id'], router) for router in routers)
bindings = self.get_ha_router_port_bindings(context,
@ -715,9 +715,12 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
if interface:
self._populate_mtu_and_subnets_for_ports(context, [interface])
# Could not filter the HA_INTERFACE_KEY here, because a DVR router
# with SNAT HA in DVR compute host also does not have that attribute.
return list(routers_dict.values())
# If this is a DVR+HA router, but the agent is question is in 'dvr'
# mode (as opposed to 'dvr_snat'), then we want to always return it
# even though it's missing the '_ha_interface' key.
return [r for r in list(routers_dict.values())
if (agent_mode == constants.L3_AGENT_MODE_DVR or
not r.get('ha') or r.get(constants.HA_INTERFACE_KEY))]
@log_helpers.log_method_call
def get_ha_sync_data_for_host(self, context, host, agent,
@ -733,7 +736,7 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
else:
sync_data = super(L3_HA_NAT_db_mixin, self).get_sync_data(context,
router_ids, active)
return self._process_sync_ha_data(context, sync_data, host)
return self._process_sync_ha_data(context, sync_data, host, agent_mode)
@classmethod
def _set_router_states(cls, context, bindings, states):

27
neutron/tests/unit/db/test_l3_hamode_db.py
View File

@ -806,7 +806,7 @@ class L3HATestCase(L3HATestFramework):
self.assertEqual(2, len(bindings))
fake_binding = mock.Mock()
fake_binding.router_id = router2['id']
fake_binding.router_id = bindings[1].router_id
fake_binding.port = None
with mock.patch.object(
self.plugin, "get_ha_router_port_bindings",
@ -814,6 +814,31 @@ class L3HATestCase(L3HATestFramework):
routers = self.plugin.get_ha_sync_data_for_host(
self.admin_ctx, self.agent1['host'], self.agent1)
self.assertEqual(1, len(routers))
self.assertIsNotNone(routers[0].get(constants.HA_INTERFACE_KEY))
def test_sync_ha_router_info_router_concurrently_deleted(self):
self._create_router()
with mock.patch.object(
self.plugin, "get_ha_router_port_bindings",
return_value=[]):
routers = self.plugin.get_ha_sync_data_for_host(
self.admin_ctx, self.agent1['host'], self.agent1)
self.assertEqual(0, len(routers))
def test_sync_ha_router_info_router_concurrently_deleted_agent_dvr(self):
self._create_router()
orig_func = self.plugin._process_sync_ha_data
def process_sync_ha_data(context, routers, host, agent_mode):
return orig_func(context, routers, host,
agent_mode=constants.L3_AGENT_MODE_DVR)
with mock.patch.object(self.plugin, '_process_sync_ha_data',
side_effect=process_sync_ha_data):
routers = self.plugin.get_ha_sync_data_for_host(
self.admin_ctx, self.agent1['host'], self.agent1)
self.assertEqual(1, len(routers))
def test_set_router_states_handles_concurrently_deleted_router(self):
router1 = self._create_router()