Merge "[ovn]: fix usage of lrp_set_options api to use **options"

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

@@ -1621,7 +1621,7 @@ 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.lrp_set_options(lrp_name, **options))
         self._transaction(commands, txn=txn)
 
     def update_network(self, context, network, original_network=None):

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

@@ -1842,7 +1842,7 @@ class TestOVNMechanismDriver(test_plugin.Ml2PluginV2TestCase):
 
                 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)
+                    lrp_name, **expected_opts)
 
     def test_update_network_need_to_frag_enabled(self):
         ovn_conf.cfg.CONF.set_override('ovn_emit_need_to_frag', True,