openstack
/
neutron
Code Issues Proposed changes

Merge "l3_ha: only pass host into update_port when updating router port bindings" into stable/pike

This commit is contained in:
Zuul 2018-01-22 22:22:12 +00:00 committed by Gerrit Code Review
parent 325bea34e0 91f377cd25
commit 3070701e4a
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/db/l3_hamode_db.py
View File

@ -703,10 +703,10 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
if states[port['device_id']] == n_const.HA_ROUTER_STATE_ACTIVE)
for port in active_ports:
port[portbindings.HOST_ID] = host
try:
self._core_plugin.update_port(admin_ctx, port['id'],
{port_def.RESOURCE_NAME: port})
self._core_plugin.update_port(
admin_ctx, port['id'],
{port_def.RESOURCE_NAME: {portbindings.HOST_ID: host}})
except (orm.exc.StaleDataError, orm.exc.ObjectDeletedError,
n_exc.PortNotFound):
# Take concurrently deleted interfaces in to account

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

@ -14,6 +14,7 @@
import mock
from neutron_lib.api.definitions import port as port_def
from neutron_lib.api.definitions import portbindings
from neutron_lib.api.definitions import provider_net as providernet
from neutron_lib.callbacks import events
@ -1118,6 +1119,32 @@ class L3HAModeDbTestCase(L3HATestFramework):
for port in self._get_router_port_bindings(router['id']):
self.assertEqual(self.agent2['host'], port[portbindings.HOST_ID])
def test_update_router_port_bindings_updates_host_only(self):
ext_net = self._create_network(self.core_plugin, self.admin_ctx,
external=True)
network_id = self._create_network(self.core_plugin, self.admin_ctx)
subnet = self._create_subnet(self.core_plugin, self.admin_ctx,
network_id)
interface_info = {'subnet_id': subnet['id']}
router = self._create_router()
self.plugin._update_router_gw_info(self.admin_ctx, router['id'],
{'network_id': ext_net})
iface = self.plugin.add_router_interface(self.admin_ctx,
router['id'],
interface_info)
with mock.patch.object(
self.plugin._core_plugin, 'update_port') as update_port_mock:
self.plugin._update_router_port_bindings(
self.admin_ctx, {router['id']: 'active'}, self.agent1['host'])
port_payload = {
port_def.RESOURCE_NAME: {
portbindings.HOST_ID: self.agent1['host']
}
}
update_port_mock.assert_called_with(
mock.ANY, iface['port_id'], port_payload)
def test_update_all_ha_network_port_statuses(self):
router = self._create_router(ha=True)
callback = l3_rpc.L3RpcCallback()