Merge pull request #147 from stackhpc/upstream/2023.1-2024-06-10

Synchronise 2023.1 with upstream

Author: markgoddard

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py

@@ -1984,7 +1984,7 @@ def set_gateway_mtu(self, context, prov_net, txn=None):
             lrp_name = utils.ovn_lrouter_port_name(port['id'])
             options = self._gen_router_port_options(port, prov_net)
             commands.append(self._nb_idl.update_lrouter_port(
-                lrp_name, if_exists=True, **options))
+                lrp_name, if_exists=True, options=options))
         self._transaction(commands, txn=txn)
 
     def _check_network_changes_in_ha_chassis_groups(self, context, lswitch,

neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py

@@ -2485,7 +2485,7 @@ def _test_update_network_fragmentation(self, new_mtu, expected_opts, grps):
 
                 lrp_name = ovn_utils.ovn_lrouter_port_name(port['port']['id'])
                 self.nb_ovn.update_lrouter_port.assert_called_once_with(
-                    lrp_name, if_exists=True, **expected_opts)
+                    lrp_name, if_exists=True, options=expected_opts)
 
     def test_update_network_need_to_frag_enabled(self):
         ovn_conf.cfg.CONF.set_override('ovn_emit_need_to_frag', True,