From 7cddc83d7b2e086fd99f4fc31279c36c7956db9e Mon Sep 17 00:00:00 2001 From: Ajay Date: Mon, 23 May 2016 18:28:28 +0000 Subject: [PATCH] Bug-5588: Missing topology-types in BGP-provided topologies - set topology types for linkstate and ipv4 & ipv6 reachability topologies - update unit-tests Change-Id: I17809fb5e574420d356ec73131b9f56a170102ac Signed-off-by: Ajay --- .../AbstractReachabilityTopologyBuilder.java | 6 +-- .../Ipv4ReachabilityTopologyBuilder.java | 13 ++++- .../Ipv6ReachabilityTopologyBuilder.java | 13 ++++- .../provider/LinkstateTopologyBuilder.java | 14 ++++-- .../src/main/yang/odl-bgp-topology-types.yang | 48 +++++++++++++++++++ .../Ipv4ReachabilityTopologyBuilderTest.java | 3 ++ .../Ipv6ReachabilityTopologyBuilderTest.java | 3 ++ .../LinkstateTopologyBuilderTest.java | 10 ++++ ...ReachabilityTopologyBuilderModuleTest.java | 1 + ...ReachabilityTopologyBuilderModuleTest.java | 1 + .../LinkstateTopologyBuilderModuleTest.java | 1 + 11 files changed, 104 insertions(+), 9 deletions(-) mode change 100644 => 100755 bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java mode change 100644 => 100755 bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilder.java mode change 100644 => 100755 bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilder.java mode change 100644 => 100755 bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java create mode 100644 bgp/topology-provider/src/main/yang/odl-bgp-topology-types.yang mode change 100644 => 100755 bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java mode change 100644 => 100755 bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java mode change 100644 => 100755 bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java old mode 100644 new mode 100755 index 5e1e0139ff..fd65369b90 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java @@ -31,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypesBuilder; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypes; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.Node1; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.Node1Builder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.IgpNodeAttributes; @@ -62,8 +62,8 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst } protected AbstractReachabilityTopologyBuilder(final DataBroker dataProvider, final RibReference locRibReference, - final TopologyId topologyId) { - super(dataProvider, locRibReference, topologyId, new TopologyTypesBuilder().build()); + final TopologyId topologyId, final TopologyTypes topologyTypes) { + super(dataProvider, locRibReference, topologyId, topologyTypes); } private NodeId advertizingNode(final Attributes attrs) { diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilder.java old mode 100644 new mode 100755 index 1fd9b36a16..de93ead8ab --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilder.java @@ -14,13 +14,24 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.ipv4.routes.Ipv4Route; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.Attributes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1Builder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.bgp.ipv4.reachability.topology.type.BgpIpv4ReachabilityTopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypes; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypesBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public final class Ipv4ReachabilityTopologyBuilder extends AbstractReachabilityTopologyBuilder { + private static final TopologyTypes IPV4_TOPOLOGY_TYPE = new TopologyTypesBuilder() + .addAugmentation(TopologyTypes1.class, + new TopologyTypes1Builder() + .setBgpIpv4ReachabilityTopology(new BgpIpv4ReachabilityTopologyBuilder().build()).build()) + .build(); + public Ipv4ReachabilityTopologyBuilder(final DataBroker dataProvider, final RibReference locRibReference, final TopologyId topologyId) { - super(dataProvider, locRibReference, topologyId); + super(dataProvider, locRibReference, topologyId, IPV4_TOPOLOGY_TYPE); } @Override diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilder.java old mode 100644 new mode 100755 index 2d8a12c797..5a45b50b1a --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilder.java @@ -14,13 +14,24 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv6.routes.ipv6.routes.Ipv6Route; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.Attributes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1Builder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.bgp.ipv6.reachability.topology.type.BgpIpv6ReachabilityTopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypes; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypesBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public final class Ipv6ReachabilityTopologyBuilder extends AbstractReachabilityTopologyBuilder { + private static final TopologyTypes IPV6_TOPOLOGY_TYPE = new TopologyTypesBuilder() + .addAugmentation(TopologyTypes1.class, + new TopologyTypes1Builder() + .setBgpIpv6ReachabilityTopology(new BgpIpv6ReachabilityTopologyBuilder().build()).build()) + .build(); + public Ipv6ReachabilityTopologyBuilder(final DataBroker dataProvider, final RibReference locRibReference, final TopologyId topologyId) { - super(dataProvider, locRibReference, topologyId); + super(dataProvider, locRibReference, topologyId, IPV6_TOPOLOGY_TYPE); } @Override diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java old mode 100644 new mode 100755 index a171da1c97..edeeed2c78 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java @@ -60,6 +60,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.Attributes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.Bandwidth; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1Builder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.bgp.linkstate.topology.type.BgpLinkstateTopologyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.SrlgId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.IsoNetId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.IsoPseudonodeId; @@ -85,6 +88,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypes; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypesBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder; @@ -95,8 +99,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.Node1Builder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.TerminationPoint1; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.TerminationPoint1Builder; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.TopologyTypes1; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.TopologyTypes1Builder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.link.attributes.IgpLinkAttributesBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.IgpNodeAttributesBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.igp.node.attributes.Prefix; @@ -119,6 +121,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder { + private static final TopologyTypes LINKSTATE_TOPOLOGY_TYPE = new TopologyTypesBuilder() + .addAugmentation(TopologyTypes1.class, + new TopologyTypes1Builder() + .setBgpLinkstateTopology(new BgpLinkstateTopologyBuilder().build()).build()) + .build(); private static final String UNHANDLED_OBJECT_CLASS = "Unhandled object class {}"; @@ -268,8 +275,7 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder nodes = new HashMap<>(); public LinkstateTopologyBuilder(final DataBroker dataProvider, final RibReference locRibReference, final TopologyId topologyId) { - super(dataProvider, locRibReference, topologyId, new TopologyTypesBuilder().addAugmentation(TopologyTypes1.class, - new TopologyTypes1Builder().build()).build()); + super(dataProvider, locRibReference, topologyId, LINKSTATE_TOPOLOGY_TYPE); } private static LinkId buildLinkId(final UriBuilder base, final LinkCase link) { diff --git a/bgp/topology-provider/src/main/yang/odl-bgp-topology-types.yang b/bgp/topology-provider/src/main/yang/odl-bgp-topology-types.yang new file mode 100644 index 0000000000..7ea3b2e02f --- /dev/null +++ b/bgp/topology-provider/src/main/yang/odl-bgp-topology-types.yang @@ -0,0 +1,48 @@ +module odl-bgp-topology-types { + namespace "urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-types"; + prefix "topology-types"; + + import network-topology { prefix nt; revision-date 2013-10-21; } + + organization "Brocade Communications Systems, Inc."; + contact "Ajay Lele "; + + description + "This module contains augmentations to ODL network topology + types for various BGP topologies. + + Copyright (c) 2016 Brocade Communications Systems, Inc. All rights reserved. + + This program and the accompanying materials are made available + under the terms of the Eclipse Public License v1.0 which + accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html"; + + revision 2016-05-24 { + description "Initial revision"; + } + + grouping bgp-ipv4-reachability-topology-type { + container bgp-ipv4-reachability-topology { + presence "Indicates a BGP IPv4 reachability aware topology"; + } + } + + grouping bgp-ipv6-reachability-topology-type { + container bgp-ipv6-reachability-topology { + presence "Indicates a BGP IPv6 reachability aware topology"; + } + } + + grouping bgp-linkstate-topology-type { + container bgp-linkstate-topology { + presence "Indicates a BGP linkstate aware topology"; + } + } + + augment "/nt:network-topology/nt:topology/nt:topology-types" { + uses bgp-ipv4-reachability-topology-type; + uses bgp-ipv6-reachability-topology-type; + uses bgp-linkstate-topology-type; + } +} diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java old mode 100644 new mode 100755 index cb4ab8057c..b727c4dd70 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java @@ -10,6 +10,7 @@ package org.opendaylight.bgpcep.bgp.topology.provider; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import com.google.common.base.Optional; @@ -64,6 +65,8 @@ public class Ipv4ReachabilityTopologyBuilderTest extends AbstractTopologyBuilder final Optional topologyMaybe = getTopology(this.ipv4TopoBuilder.getInstanceIdentifier()); assertTrue(topologyMaybe.isPresent()); final Topology topology = topologyMaybe.get(); + assertNotNull(topology.getTopologyTypes().getAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1.class)); + assertNotNull(topology.getTopologyTypes().getAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1.class).getBgpIpv4ReachabilityTopology()); assertEquals(1, topology.getNode().size()); final Node node = topology.getNode().get(0); assertEquals(NEXT_HOP, node.getNodeId().getValue()); diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java old mode 100644 new mode 100755 index c1cd6e1f37..a539ee0116 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java @@ -10,6 +10,7 @@ package org.opendaylight.bgpcep.bgp.topology.provider; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.opendaylight.bgpcep.bgp.topology.provider.Ipv4ReachabilityTopologyBuilderTest.PATH_ID; @@ -64,6 +65,8 @@ public class Ipv6ReachabilityTopologyBuilderTest extends AbstractTopologyBuilder final Optional topologyMaybe = getTopology(this.ipv6TopoBuilder.getInstanceIdentifier()); assertTrue(topologyMaybe.isPresent()); final Topology topology = topologyMaybe.get(); + assertNotNull(topology.getTopologyTypes().getAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1.class)); + assertNotNull(topology.getTopologyTypes().getAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1.class).getBgpIpv6ReachabilityTopology()); assertEquals(1, topology.getNode().size()); final Node node = topology.getNode().get(0); assertEquals(NEXT_HOP, node.getNodeId().getValue()); diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java old mode 100644 new mode 100755 index 9e384e69ea..17860f7c5d --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java @@ -10,6 +10,7 @@ package org.opendaylight.bgpcep.bgp.topology.provider; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -105,6 +106,15 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { this.linkstateRouteIID = path.builder().child((Class)LinkstateRoutes.class).child(LinkstateRoute.class, new LinkstateRouteKey(LINKSTATE_ROUTE_KEY)).build(); } + @Test + public void testLinkstateTopologyBuilderTopologyTypes() { + final Optional topologyMaybe = getTopology(this.linkstateTopoBuilder.getInstanceIdentifier()); + assertTrue(topologyMaybe.isPresent()); + final Topology topology = topologyMaybe.get(); + assertNotNull(topology.getTopologyTypes().getAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1.class)); + assertNotNull(topology.getTopologyTypes().getAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.topology.types.rev160524.TopologyTypes1.class).getBgpLinkstateTopology()); + } + @Test public void testIsisLinkstateTopologyBuilder() throws TransactionCommitFailedException { // create node diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java index d2f27a24a4..17105216f6 100644 --- a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java @@ -43,6 +43,7 @@ public class Ipv4ReachabilityTopologyBuilderModuleTest extends AbstractRIBImplMo paths.add("/META-INF/yang/bmp-monitor.yang"); paths.add("/META-INF/yang/bmp-message.yang"); paths.add("/META-INF/yang/ietf-yang-types.yang"); + paths.add("/META-INF/yang/odl-bgp-topology-types.yang"); return paths; } diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java index 72e901e7a7..397dadbb49 100644 --- a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java @@ -43,6 +43,7 @@ public class Ipv6ReachabilityTopologyBuilderModuleTest extends AbstractRIBImplMo paths.add("/META-INF/yang/bmp-monitor.yang"); paths.add("/META-INF/yang/bmp-message.yang"); paths.add("/META-INF/yang/ietf-yang-types.yang"); + paths.add("/META-INF/yang/odl-bgp-topology-types.yang"); return paths; } diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java index 0d46039364..be331add25 100644 --- a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java @@ -45,6 +45,7 @@ public class LinkstateTopologyBuilderModuleTest extends AbstractRIBImplModuleTes paths.add("/META-INF/yang/bmp-monitor.yang"); paths.add("/META-INF/yang/bmp-message.yang"); paths.add("/META-INF/yang/ietf-yang-types.yang"); + paths.add("/META-INF/yang/odl-bgp-topology-types.yang"); return paths; } -- 2.36.6