From e2d4cede4549eb4df4446fd7eb279d73977289b5 Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Mon, 11 Nov 2019 12:33:54 +0000 Subject: [PATCH] Fix resource_filter.bind method that was changed in neutron This happened in [0], we need to add a partial workaround until a new neutron release is made. [0] https://review.opendev.org/288271 Change-Id: I5661e8689d8e3ea861fdd0393e6f25c42cd324c3 --- .../services/bgp/scheduler/bgp_dragent_scheduler.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neutron_dynamic_routing/services/bgp/scheduler/bgp_dragent_scheduler.py b/neutron_dynamic_routing/services/bgp/scheduler/bgp_dragent_scheduler.py index 7825e330..3ab1ad35 100644 --- a/neutron_dynamic_routing/services/bgp/scheduler/bgp_dragent_scheduler.py +++ b/neutron_dynamic_routing/services/bgp/scheduler/bgp_dragent_scheduler.py @@ -38,7 +38,7 @@ BGP_SPEAKER_PER_DRAGENT = 1 class BgpDrAgentFilter(base_resource_filter.BaseResourceFilter): - def bind(self, context, agents, bgp_speaker_id): + def bind(self, context, agents, bgp_speaker_id, force_scheduling=False): """Bind the BgpSpeaker to a BgpDrAgent.""" bound_agents = agents[:] for agent in agents: @@ -61,6 +61,9 @@ class BgpDrAgentFilter(base_resource_filter.BaseResourceFilter): 'agent_id': agent_id}) super(BgpDrAgentFilter, self).bind(context, bound_agents, bgp_speaker_id) + # TODO(frickler): once neutron is released, switch to this + # super(BgpDrAgentFilter, self).bind(context, bound_agents, + # bgp_speaker_id, force_scheduling) def filter_agents(self, plugin, context, bgp_speaker): """Return the agents that can host the BgpSpeaker."""