openstack
/
neutron
Code Issues Proposed changes

Merge "Fix _create_dvr_floating_gw_port missing payload field"

This commit is contained in:
Zuul 2021-09-22 23:06:33 +00:00 committed by Gerrit Code Review
parent 5ed665a921 0234aa6157
commit d25cfaa702
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/l3_dvr_db.py
View File

@ -464,7 +464,7 @@ class DVRResourceOperationHandler(object):
# FloatingIP agent gateway port
if router_dict.get('distributed'):
hostid = self._get_dvr_service_port_hostid(
context, fip['fixed_port_id'])
context, fip['port_id'])
if hostid:
# FIXME (Swami): This FIP Agent Gateway port should be
# created only once and there should not be a duplicate
@ -481,7 +481,7 @@ class DVRResourceOperationHandler(object):
# port. Get the port_dict, inherit the service port host
# and device owner(if it does not exist).
port = self._core_plugin.get_port(
admin_ctx, fip['fixed_port_id'])
admin_ctx, fip['port_id'])
allowed_device_owners = (
n_utils.get_dvr_allowed_address_pair_device_owners())
# NOTE: We just need to deal with ports that do not

2
neutron/tests/unit/db/test_l3_dvr_db.py
View File

@ -633,7 +633,7 @@ class L3DvrTestCase(test_db_base_plugin_v2.NeutronDbPluginV2TestCase):
resources.FLOATING_IP, events.AFTER_CREATE, self,
payload=events.DBEventPayload(
context=mock.Mock(), states=(dict(
router_id=router_db['id'], fixed_port_id=port['id'],
router_id=router_db['id'], port_id=port['id'],
fixed_ip_address='1.2.3.4', id=fip['id'],
floating_network_id=fip['floating_network_id']),),
resource_id=fip['id'],