openstack
/
neutron
Code Issues Proposed changes

Merge "Remove OVN floating IP deletion of associated LSP"

This commit is contained in:
Zuul 2020-09-17 01:22:43 +00:00 committed by Gerrit Code Review
parent 85e03bd92a a83d1bf5ae
commit c2d8de10e4
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py
View File

@ -632,16 +632,6 @@ class OVNClient(object):
admin_context, fip_db['floating_port_id']) admin_context, fip_db['floating_port_id'])
gw_lrouter_name = utils.ovn_name(router_id) gw_lrouter_name = utils.ovn_name(router_id)
# TODO(chandrav): Since the floating ip port is not
# bound to any chassis, packets destined to floating ip
# will be dropped. To overcome this, delete the floating
# ip port. Proper fix for this would be to redirect packets
# destined to floating ip to the router port. This would
# require changes in ovn-northd.
commands.append(self._nb_idl.delete_lswitch_port(
fip_db['floating_port_id'],
utils.ovn_name(floatingip['floating_network_id'])))
ext_ids = { ext_ids = {
ovn_const.OVN_FIP_EXT_ID_KEY: floatingip['id'], ovn_const.OVN_FIP_EXT_ID_KEY: floatingip['id'],
ovn_const.OVN_REV_NUM_EXT_ID_KEY: str(utils.get_revision_number( ovn_const.OVN_REV_NUM_EXT_ID_KEY: str(utils.get_revision_number(

6
neutron/tests/unit/services/ovn_l3/test_plugin.py
View File

@ -919,8 +919,6 @@ class TestOVNL3RouterPlugin(test_mech_driver.Ml2PluginV2TestCase):
external_ip='192.168.0.10', external_ip='192.168.0.10',
logical_port='port_id', logical_port='port_id',
external_ids=expected_ext_ids) external_ids=expected_ext_ids)
self.l3_inst._ovn.delete_lswitch_port.assert_called_once_with(
'fip-port-id', 'neutron-fip-net-id')
def test_create_floatingip_distributed(self): def test_create_floatingip_distributed(self):
self.l3_inst._ovn.is_col_present.return_value = True self.l3_inst._ovn.is_col_present.return_value = True
@ -992,8 +990,6 @@ class TestOVNL3RouterPlugin(test_mech_driver.Ml2PluginV2TestCase):
external_ip='192.168.0.10', external_ip='192.168.0.10',
logical_port='port_id', logical_port='port_id',
external_ids=expected_ext_ids) external_ids=expected_ext_ids)
self.l3_inst._ovn.delete_lswitch_port.assert_called_once_with(
'fip-port-id', 'neutron-fip-net-id')
def test_create_floatingip_external_ip_present_type_snat(self): def test_create_floatingip_external_ip_present_type_snat(self):
self.l3_inst._ovn.is_col_present.return_value = True self.l3_inst._ovn.is_col_present.return_value = True
@ -1018,8 +1014,6 @@ class TestOVNL3RouterPlugin(test_mech_driver.Ml2PluginV2TestCase):
external_ip='192.168.0.10', external_ip='192.168.0.10',
logical_port='port_id', logical_port='port_id',
external_ids=expected_ext_ids) external_ids=expected_ext_ids)
self.l3_inst._ovn.delete_lswitch_port.assert_called_once_with(
'fip-port-id', 'neutron-fip-net-id')
def test_create_floatingip_lsp_external_id(self): def test_create_floatingip_lsp_external_id(self):
foo_lport = fake_resources.FakeOvsdbRow.create_one_ovsdb_row() foo_lport = fake_resources.FakeOvsdbRow.create_one_ovsdb_row()