Fix BGP RIB link-state configuration 36/8536/2
authorMarek Gradzki <mgradzki@cisco.com>
Tue, 26 Sep 2017 11:00:02 +0000 (13:00 +0200)
committerMarek Gradzki <mgradzki@cisco.com>
Mon, 2 Oct 2017 11:12:39 +0000 (11:12 +0000)
Change-Id: I896f1aae3b71e21bd6127aedf22faef07a132daf
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpRIBProvider.java

index 60d4783..5663b7c 100644 (file)
@@ -47,6 +47,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev160614.AfiSafi2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev160614.AfiSafi2Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev160614.LINKSTATE;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.RibId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpId;
@@ -80,7 +81,8 @@ final class BgpRIBProvider extends ProviderTrait<RIB> {
         final Ipv4Address routerId = new Ipv4Address(cfg.bgpBindingAddress.get());
         final ClusterIdentifier clusterId = new ClusterIdentifier(routerId);
         LOG.debug("Creating BGP RIB: routerId={}, asNumber={}", routerId, asNumber);
-        // TODO configure other BGP Multiprotocol extensions:
+        // TODO(HONEYCOMB-395): should all afi-safis use the same send-max value?
+        // TODO(HONEYCOMB-363): configure other BGP Multiprotocol extensions:
         final List<AfiSafi> afiSafi = ImmutableList.of(
                 new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
                         .addAugmentation(AfiSafi2.class,
@@ -88,6 +90,11 @@ final class BgpRIBProvider extends ProviderTrait<RIB> {
                                         .setSendMax(cfg.bgpSendMaxMaths.get().shortValue()).build())
                         .build(),
                 new AfiSafiBuilder().setAfiSafiName(IPV4LABELLEDUNICAST.class)
+                        .addAugmentation(AfiSafi2.class,
+                                new AfiSafi2Builder().setReceive(cfg.isBgpMultiplePathsEnabled())
+                                        .setSendMax(cfg.bgpSendMaxMaths.get().shortValue()).build())
+                        .build(),
+                new AfiSafiBuilder().setAfiSafiName(LINKSTATE.class)
                         .addAugmentation(AfiSafi2.class,
                                 new AfiSafi2Builder().setReceive(cfg.isBgpMultiplePathsEnabled())
                                         .setSendMax(cfg.bgpSendMaxMaths.get().shortValue()).build())