import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionStatistics;
import org.opendaylight.protocol.bgp.rib.impl.spi.RIB;
import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContext;
-import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer;
import org.opendaylight.protocol.bgp.rib.spi.BGPSession;
+import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
import org.opendaylight.protocol.bgp.rib.spi.BGPTerminationReason;
import org.opendaylight.protocol.bgp.rib.spi.Peer;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
* Class representing a peer. We have a single instance for each peer, which provides translation from BGP events into
* RIB actions.
*/
-public class BGPPeer implements ReusableBGPPeer, Peer, AutoCloseable, BGPPeerRuntimeMXBean, TransactionChainListener {
+public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeerRuntimeMXBean, TransactionChainListener {
private static final Logger LOG = LoggerFactory.getLogger(BGPPeer.class);
// update AdjRibs
final Attributes attrs = message.getAttributes();
MpReachNlri mpReach = null;
- if (message.getNlri() != null) {
+ final boolean isAnyNlriAnnounced = message.getNlri() != null;
+ if (isAnyNlriAnnounced) {
mpReach = prefixesToMpReach(message);
} else if (attrs != null && attrs.getAugmentation(Attributes1.class) != null) {
mpReach = attrs.getAugmentation(Attributes1.class).getMpReachNlri();
}
MpUnreachNlri mpUnreach = null;
if (message.getWithdrawnRoutes() != null) {
- mpUnreach = prefixesToMpUnreach(message);
+ mpUnreach = prefixesToMpUnreach(message, isAnyNlriAnnounced);
} else if (attrs != null && attrs.getAugmentation(Attributes2.class) != null) {
mpUnreach = attrs.getAugmentation(Attributes2.class).getMpUnreachNlri();
}
* Create MPUnreach for the prefixes to be handled in the same way as linkstate routes
*
* @param message Update message containing withdrawn routes
+ * @param isAnyNlriAnnounced
* @return MpUnreachNlri with prefixes from the withdrawn routes field
*/
- private static MpUnreachNlri prefixesToMpUnreach(final Update message) {
+ private static MpUnreachNlri prefixesToMpUnreach(final Update message, final boolean isAnyNlriAnnounced) {
final List<Ipv4Prefixes> prefixes = new ArrayList<>();
for (final Ipv4Prefix p : message.getWithdrawnRoutes().getWithdrawnRoutes()) {
- prefixes.add(new Ipv4PrefixesBuilder().setPrefix(p).build());
+ boolean nlriAnounced = false;
+ if(isAnyNlriAnnounced) {
+ nlriAnounced = message.getNlri().getNlri().contains(p);
+ }
+
+ if(!nlriAnounced) {
+ prefixes.add(new Ipv4PrefixesBuilder().setPrefix(p).build());
+ }
}
return new MpUnreachNlriBuilder().setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class).setWithdrawnRoutes(
new WithdrawnRoutesBuilder().setDestinationType(