From ff5d6a03326453b2831488426af613580467ea43 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Tue, 23 Jan 2018 10:01:22 +0100 Subject: [PATCH] BGPCEP-748: Fix AFI/SAFI peer support registration when old-school BGP-4 is used. Change-Id: I2137ea2647f01fb87bad04e682fe0bf5541768e8 Signed-off-by: Claudio D. Gasparini --- .../org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java index 71b67bd327..f709cbd1a6 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java @@ -341,7 +341,7 @@ public class BGPPeer extends BGPPeerStateImpl implements BGPSessionListener, Pee peerIId, this.peerRole, this.simpleRoutingPolicy)); } } - addBgp4Support(peerId, announceNone); + addBgp4Support(peerId, peerIId, announceNone); if (!isLearnNone(this.simpleRoutingPolicy)) { this.effRibInWriter = EffectiveRibInWriter.create(this.rib.getService(), @@ -367,10 +367,15 @@ public class BGPPeer extends BGPPeerStateImpl implements BGPSessionListener, Pee } //try to add a support for old-school BGP-4, if peer did not advertise IPv4-Unicast MP capability - private void addBgp4Support(final PeerId peerId, final boolean announceNone) { + private void addBgp4Support(final PeerId peerId, final YangInstanceIdentifier peerIId, final boolean announceNone) { final TablesKey key = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class); if (this.tables.add(key) && !announceNone) { createAdjRibOutListener(peerId, key, false); + final ExportPolicyPeerTracker exportTracker = this.rib.getExportPolicyPeerTracker(key); + if (exportTracker != null) { + this.tableRegistration.add(exportTracker.registerPeer(peerId, null, peerIId, + this.peerRole, this.simpleRoutingPolicy)); + } } } -- 2.36.6