// 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(
this.classic.onSessionUp(this.session);
Assert.assertArrayEquals(new byte[] {1, 1, 1, 1}, this.classic.getRawIdentifier());
assertEquals("BGPPeer{name=testPeer, tables=[TablesKey [_afi=class org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily, _safi=class org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily]]}", this.classic.toString());
- final List<Ipv4Prefix> prefs = Lists.newArrayList(new Ipv4Prefix("127.0.0.1/32"), new Ipv4Prefix("2.2.2.2/24"));
+ final List<Ipv4Prefix> prefs = Lists.newArrayList(new Ipv4Prefix("8.0.1.0/28"), new Ipv4Prefix("127.0.0.1/32"), new Ipv4Prefix("2.2.2.2/24"));
final UpdateBuilder ub = new UpdateBuilder();
ub.setNlri(new NlriBuilder().setNlri(prefs).build());
ub.setAttributes(new AttributesBuilder().build());
this.classic.onMessage(this.session, ub.build());
- assertEquals(2, this.routes.size());
+ assertEquals(3, this.routes.size());
//create new peer so that it gets advertized routes from RIB
try (final BGPPeer testingPeer = new BGPPeer("testingPeer", getRib())) {
testingPeer.onSessionUp(this.session);
- assertEquals(2, this.routes.size());
+ assertEquals(3, this.routes.size());
assertEquals(1, testingPeer.getBgpPeerState().getSessionEstablishedCount().intValue());
assertEquals(1, testingPeer.getBgpPeerState().getRouteTable().size());
assertNotNull(testingPeer.getBgpSessionState());