diff --git a/neutron/objects/l3agent.py b/neutron/objects/l3agent.py index 51cc70a318e..c25f40b6df8 100644 --- a/neutron/objects/l3agent.py +++ b/neutron/objects/l3agent.py @@ -14,8 +14,6 @@ from neutron_lib.db import api as db_api from neutron_lib.objects import common_types from oslo_versionedobjects import fields as obj_fields -from sqlalchemy import sql - from neutron.common import _constants as n_const from neutron.db.models import agent as agent_model from neutron.db.models import l3_attrs @@ -59,9 +57,7 @@ class RouterL3AgentBinding(base.NeutronDbObject): agent_model.Agent.admin_state_up).outerjoin( l3_attrs.RouterExtraAttributes, l3_attrs.RouterExtraAttributes.router_id == - l3agent.RouterL3AgentBinding.router_id).filter( - l3_attrs.RouterExtraAttributes.ha.in_( - [sql.false(), sql.null()]))) + l3agent.RouterL3AgentBinding.router_id)) bindings = [cls._load_object(context, db_obj) for db_obj in query.all()] return bindings diff --git a/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py b/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py index 8ac13f184e6..77741a28e63 100644 --- a/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py +++ b/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py @@ -1718,7 +1718,7 @@ class L3AgentSchedulerDbMixinTestCase(L3HATestCaseMixin): self._set_l3_agent_dead(self.agent_id1) with mock.patch.object(self.plugin, 'reschedule_router') as reschedule: self.plugin.reschedule_routers_from_down_agents() - self.assertFalse(reschedule.called) + self.assertTrue(reschedule.called) def test_list_l3_agents_hosting_ha_router(self): router = self._create_ha_router()