Merge "[OVN] Try to bind ports only to the ovn-controller agents" into stable/yoga

Author: Zuul

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

@@ -984,7 +984,9 @@ def bind_port(self, context):
             LOG.error('Validation of binding profile unexpectedly failed '
                       'while attempting to bind port %s', port['id'])
             raise e
-        agents = n_agent.AgentCache().get_agents({'host': bind_host})
+        agents = n_agent.AgentCache().get_agents(
+            {'host': bind_host,
+             'agent_type': ovn_const.OVN_CONTROLLER_TYPES})
         if not agents:
             LOG.warning('Refusing to bind port %(port_id)s due to '
                         'no OVN chassis for host: %(host)s',

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

@@ -1233,7 +1233,8 @@ def _test_bind_port_failed(self, fake_segments):
             fake_port, fake_host, fake_segments)
         self.mech_driver.bind_port(fake_port_context)
         neutron_agent.AgentCache().get_agents.assert_called_once_with(
-            {'host': fake_host})
+            {'host': fake_host,
+             'agent_type': ovn_const.OVN_CONTROLLER_TYPES})
         fake_port_context.set_binding.assert_not_called()
 
     def test_bind_port_host_not_found(self):
@@ -1263,7 +1264,8 @@ def _test_bind_port(self, fake_segments):
             fake_port, fake_host, fake_segments)
         self.mech_driver.bind_port(fake_port_context)
         neutron_agent.AgentCache().get_agents.assert_called_once_with(
-            {'host': fake_host})
+            {'host': fake_host,
+             'agent_type': ovn_const.OVN_CONTROLLER_TYPES})
         fake_port_context.set_binding.assert_called_once_with(
             fake_segments[0]['id'],
             portbindings.VIF_TYPE_OVS,
@@ -1280,7 +1282,8 @@ def _test_bind_port_sriov(self, fake_segments):
             fake_port, fake_host, fake_segments)
         self.mech_driver.bind_port(fake_port_context)
         neutron_agent.AgentCache().get_agents.assert_called_once_with(
-            {'host': fake_host})
+            {'host': fake_host,
+             'agent_type': ovn_const.OVN_CONTROLLER_TYPES})
         fake_port_context.set_binding.assert_called_once_with(
             fake_segments[0]['id'],
             portbindings.VIF_TYPE_OVS,
@@ -1310,7 +1313,8 @@ def _test_bind_port_remote_managed(self, fake_segments):
             fake_port, fake_host, fake_segments)
         self.mech_driver.bind_port(fake_port_context)
         neutron_agent.AgentCache().get_agents.assert_called_once_with(
-            {'host': fake_smartnic_dpu})
+            {'host': fake_smartnic_dpu,
+             'agent_type': ovn_const.OVN_CONTROLLER_TYPES})
         fake_port_context.set_binding.assert_called_once_with(
             fake_segments[0]['id'],
             portbindings.VIF_TYPE_OVS,
@@ -1331,7 +1335,8 @@ def test_bind_port_vdpa(self):
             fake_port, fake_host, fake_segments)
         self.mech_driver.bind_port(fake_port_context)
         neutron_agent.AgentCache().get_agents.assert_called_once_with(
-            {'host': fake_host})
+            {'host': fake_host,
+             'agent_type': ovn_const.OVN_CONTROLLER_TYPES})
         fake_port_context.set_binding.assert_called_once_with(
             fake_segments[0]['id'],
             portbindings.VIF_TYPE_OVS,