diff --git a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py index f94fc799ef3..fa4639c050f 100644 --- a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py +++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py @@ -2058,7 +2058,8 @@ class OVNClient(object): for port in ports: lrp_name = utils.ovn_lrouter_port_name(port['id']) options = self._gen_router_port_options(port, prov_net) - commands.append(self._nb_idl.lrp_set_options(lrp_name, **options)) + commands.append(self._nb_idl.update_lrouter_port( + lrp_name, if_exists=True, **options)) self._transaction(commands, txn=txn) def _check_network_changes_in_ha_chassis_groups(self, diff --git a/neutron/tests/unit/fake_resources.py b/neutron/tests/unit/fake_resources.py index f7aed0489ef..436d2ebc4b5 100644 --- a/neutron/tests/unit/fake_resources.py +++ b/neutron/tests/unit/fake_resources.py @@ -63,7 +63,6 @@ class FakeOvsdbNbOvnIdl(object): self.delete_lswitch_port = mock.Mock() self.get_acls_for_lswitches = mock.Mock() self.lrp_del = mock.Mock() - self.lrp_set_options = mock.Mock() self.lr_add = mock.Mock() self.update_lrouter = mock.Mock() self.lr_del = mock.Mock() diff --git a/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py b/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py index 112324c772e..ac46346f257 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py +++ b/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py @@ -2573,8 +2573,8 @@ class TestOVNMechanismDriver(TestOVNMechanismDriverBase): self.mech_driver.update_network_postcommit(fake_ctx) lrp_name = ovn_utils.ovn_lrouter_port_name(port['port']['id']) - self.nb_ovn.lrp_set_options.assert_called_once_with( - lrp_name, **expected_opts) + self.nb_ovn.update_lrouter_port.assert_called_once_with( + lrp_name, if_exists=True, **expected_opts) def test_update_network_need_to_frag_enabled(self): ovn_conf.cfg.CONF.set_override('ovn_emit_need_to_frag', True, diff --git a/neutron/tests/unit/services/ovn_l3/test_plugin.py b/neutron/tests/unit/services/ovn_l3/test_plugin.py index 5f09a53ecbd..4fcb6b58a6f 100644 --- a/neutron/tests/unit/services/ovn_l3/test_plugin.py +++ b/neutron/tests/unit/services/ovn_l3/test_plugin.py @@ -1987,7 +1987,7 @@ class TestOVNL3RouterPlugin(test_mech_driver.Ml2PluginV2TestCase): self.l3_inst._nb_ovn.add_lrouter_port.assert_called_once_with( **fake_router_port_assert) # Since if_exists = True it will safely return - self.l3_inst._nb_ovn.lrp_set_options( + self.l3_inst._nb_ovn.update_lrouter_port( name='lrp-router-port-id', if_exists=True, options=fake_router_port_assert) # If no if_exists is provided, it is defaulted to true, so this