X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bgp%2Frib-spi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fspi%2FRIBSupportTest.java;h=5ef587438fbe7db277c1f782d7ad0d261bf45fae;hb=3860d202e14ae693d515cf40f4795fd086a5d75d;hp=d5278196e8666b62a882eec1e12c39c376ee76f3;hpb=ae61a7089e3a1c6a7f69dfe1c4981282a439e22d;p=bgpcep.git diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java index d5278196e8..5ef587438f 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.rib.spi; import static junit.framework.TestCase.assertFalse; @@ -16,7 +15,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; -import com.google.common.collect.ImmutableMap; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -27,15 +25,15 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec; +import org.opendaylight.mdsal.binding.dom.adapter.AdapterContext; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; -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.message.rev180329.UpdateBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.UpdateBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.Attributes; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.AttributesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2; @@ -58,11 +56,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.test import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.test.rev180515.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.test.rev180515.ipv4.routes.Ipv4Routes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.test.rev180515.ipv4.routes.ipv4.routes.Ipv4Route; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.UnicastSubsequentAddressFamily; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv4AddressFamily; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.UnicastSubsequentAddressFamily; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.Ipv4NextHopCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.Ipv4NextHopCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -78,8 +76,8 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest { private static final String ROUTE_KEY = "prefix"; private static final String PREFIX = "1.2.3.4/32"; private static final QName PATH_ID_QNAME = QName.create(Ipv4Route.QNAME, "path-id").intern(); - private static final NodeIdentifierWithPredicates PREFIX_NII = new NodeIdentifierWithPredicates(Ipv4Route.QNAME, - ImmutableMap.of(QName.create(Ipv4Route.QNAME, ROUTE_KEY).intern(), PREFIX)); + private static final NodeIdentifierWithPredicates PREFIX_NII = NodeIdentifierWithPredicates.of(Ipv4Route.QNAME, + QName.create(Ipv4Route.QNAME, ROUTE_KEY).intern(), PREFIX); private RIBSupportTestImp ribSupportTestImp; private static final TablesKey TABLES_KEY = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class); @@ -96,13 +94,13 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest { private final Map> routesMap = new HashMap<>(); private ContainerNode attributes; private MapEntryNode mapEntryNode; - private BindingToNormalizedNodeCodec mappingService; + private AdapterContext context; @Before public void setUp() throws Exception { super.setup(); MockitoAnnotations.initMocks(this); - this.ribSupportTestImp = new RIBSupportTestImp(this.mappingService); + this.ribSupportTestImp = new RIBSupportTestImp(context.currentSerializer()); this.emptyTree = Mockito.mock(DataTreeCandidateNode.class); this.emptySubTree = Mockito.mock(DataTreeCandidateNode.class); this.subTree = Mockito.mock(DataTreeCandidateNode.class); @@ -155,33 +153,28 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest { @Override protected final AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() { final AbstractDataBrokerTestCustomizer customizer = super.createDataBrokerTestCustomizer(); - this.mappingService = customizer.getBindingToNormalized(); + this.context = customizer.getAdapterContext(); return customizer; } - @Test - public void pathIdQName() { - assertEquals(PATH_ID_QNAME,this.ribSupportTestImp.pathIdQName()); - } - @Test public void routesCaseClass() { - assertEquals(Ipv4RoutesCase.class,this.ribSupportTestImp.routesCaseClass()); + assertEquals(Ipv4RoutesCase.class, this.ribSupportTestImp.routesCaseClass()); } @Test public void routesContainerClass() { - assertEquals(Ipv4Routes.class,this.ribSupportTestImp.routesContainerClass()); + assertEquals(Ipv4Routes.class, this.ribSupportTestImp.routesContainerClass()); } @Test public void routesListClass() { - assertEquals(Ipv4Route.class,this.ribSupportTestImp.routesListClass()); + assertEquals(Ipv4Route.class, this.ribSupportTestImp.routesListClass()); } @Test public void routeQName() { - assertEquals(Ipv4Route.QNAME,this.ribSupportTestImp.routeQName()); + assertEquals(Ipv4Route.QNAME, this.ribSupportTestImp.routeQName()); } @Test @@ -241,7 +234,7 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest { @Test public void buildUpdate() { final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder() - .setGlobal(new Ipv4Address("10.0.0.2")).build()).build(); + .setGlobal(new Ipv4AddressNoZone("10.0.0.2")).build()).build(); final Attributes attr = new AttributesBuilder().setCNextHop(nextHop).build(); final Collection routes = new HashSet<>();