X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bgp%2Frib-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fimpl%2FSynchronizationAndExceptionTest.java;h=0206eee9bb6a3ad7102a7d7334d13d140571ef4d;hb=ae61a7089e3a1c6a7f69dfe1c4981282a439e22d;hp=42e4dc9198e475319459f013b52e997606148a6f;hpb=ac35f5db1582e2319c88976ddaa56ec17397d4db;p=bgpcep.git diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java index 42e4dc9198..0206eee9bb 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java @@ -5,20 +5,26 @@ * 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.impl; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.internal.verification.VerificationModeFactory.times; -import static org.opendaylight.protocol.bgp.rib.impl.AdjRibInWriter.ATTRIBUTES_UPTODATE_FALSE; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.ADJRIBIN_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.ATTRIBUTES_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.BGPRIB_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.PEER_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.RIB_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.TABLES_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.UPTODATE_NID; import com.google.common.base.Optional; +import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -41,16 +47,17 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; import org.mockito.Mock; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.api.DOMDataBroker; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMTransactionChain; import org.opendaylight.protocol.bgp.mode.api.PathSelectionMode; import org.opendaylight.protocol.bgp.mode.impl.base.BasePathSelectionModeFactory; import org.opendaylight.protocol.bgp.parser.BgpExtendedMessageUtil; import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl; +import org.opendaylight.protocol.bgp.rib.spi.RIBQNames; import org.opendaylight.protocol.bgp.rib.spi.RibSupportUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; @@ -80,15 +87,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.GracefulRestartCapabilityBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.MultiprotocolCapabilityBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerRole; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.Peer; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.peer.AdjRibIn; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Attributes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.BgpId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.BgpOrigin; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily; @@ -110,13 +113,13 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { private static final int LOCAL_PORT = 12345; private static final String RIB_ID = "1.1.1.2"; private static final YangInstanceIdentifier PEER_PATH = YangInstanceIdentifier.builder() - .node(BgpRib.QNAME).node(Rib.QNAME) + .node(BGPRIB_NID).node(RIB_NID) .nodeWithKey(Rib.QNAME, QName.create(Rib.QNAME, "id").intern(), RIB_ID) - .node(Peer.QNAME).nodeWithKey(Peer.QNAME, AdjRibInWriter.PEER_ID_QNAME, "bgp://1.1.1.2").build(); - private static final YangInstanceIdentifier TABLE_PATH = PEER_PATH.node(AdjRibIn.QNAME).node(Tables.QNAME) + .node(PEER_NID).nodeWithKey(Peer.QNAME, RIBQNames.PEER_ID_QNAME, "bgp://1.1.1.2").build(); + private static final YangInstanceIdentifier TABLE_PATH = PEER_PATH.node(ADJRIBIN_NID).node(TABLES_NID) .node(RibSupportUtils.toYangTablesKey(new TablesKey(Ipv4AddressFamily.class, - UnicastSubsequentAddressFamily.class))).node(Attributes.QNAME) - .node(QName.create(Attributes.QNAME, "uptodate")); + UnicastSubsequentAddressFamily.class))).node(ATTRIBUTES_NID) + .node(UPTODATE_NID); private final IpAddress neighbor = new IpAddress(new Ipv4Address(LOCAL_IP)); private final BgpTableType ipv4tt = new BgpTableTypeImpl(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class); @@ -132,7 +135,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { @Mock private DOMTransactionChain domChain; @Mock - private DOMDataWriteTransaction tx; + private DOMDataTreeWriteTransaction tx; @Override @Before @@ -184,15 +187,16 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { doReturn(null).when(futureChannel).addListener(any()); doReturn(futureChannel).when(this.speakerListener).close(); doReturn(futureChannel).when(this.speakerListener).writeAndFlush(any(Notify.class)); - doReturn(this.domChain).when(this.domBroker).createTransactionChain(any()); + doReturn(this.domChain).when(this.domBroker).createMergingTransactionChain(any()); doReturn(this.tx).when(this.domChain).newWriteOnlyTransaction(); final DOMDataTreeChangeService dOMDataTreeChangeService = mock(DOMDataTreeChangeService.class); final ListenerRegistration listener = mock(ListenerRegistration.class); doReturn(listener).when(dOMDataTreeChangeService).registerDataTreeChangeListener(any(), any()); doNothing().when(listener).close(); + doNothing().when(this.domChain).close(); - doReturn(Collections.singletonMap(DOMDataTreeChangeService.class, dOMDataTreeChangeService)) - .when(this.domBroker).getSupportedExtensions(); + doReturn(ImmutableClassToInstanceMap.of(DOMDataTreeChangeService.class, dOMDataTreeChangeService)) + .when(this.domBroker).getExtensions(); doNothing().when(this.tx).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class)); doNothing().when(this.tx).put(eq(LogicalDatastoreType.OPERATIONAL), @@ -219,8 +223,8 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { ribImpl.instantiateServiceInstance(); ribImpl.onGlobalContextUpdated(this.schemaService.getGlobalContext()); - final BGPPeer bgpPeer = new BGPPeer(this.tableRegistry, neighbor, ribImpl, PeerRole.Ibgp, null, - AFI_SAFIS_ADVERTIZED, Collections.emptySet()); + final BGPPeer bgpPeer = AbstractAddPathTest.configurePeer(this.tableRegistry, neighbor.getIpv4Address(), + ribImpl, null, PeerRole.Ibgp, this.serverRegistry, AFI_SAFIS_ADVERTIZED, Collections.emptySet()); bgpPeer.instantiateServiceInstance(); final BGPSessionImpl bgpSession = new BGPSessionImpl(bgpPeer, this.speakerListener, this.classicOpen, this.classicOpen.getHoldTimer(), null); @@ -228,8 +232,8 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { bgpPeer.onSessionUp(bgpSession); final Nlri n1 = new NlriBuilder().setPrefix(new Ipv4Prefix("8.0.1.0/28")).build(); - final Nlri n2 = new NlriBuilder().setPrefix( new Ipv4Prefix("127.0.0.1/32")).build(); - final Nlri n3 = new NlriBuilder().setPrefix( new Ipv4Prefix("2.2.2.2/24")).build(); + final Nlri n2 = new NlriBuilder().setPrefix(new Ipv4Prefix("127.0.0.1/32")).build(); + final Nlri n3 = new NlriBuilder().setPrefix(new Ipv4Prefix("2.2.2.2/24")).build(); final List nlris = Lists.newArrayList(n1, n2, n3); final UpdateBuilder wrongMessage = new UpdateBuilder(); wrongMessage.setNlri(nlris); @@ -254,7 +258,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { any(YangInstanceIdentifier.class), any(NormalizedNode.class)); verify(this.tx).delete(eq(LogicalDatastoreType.OPERATIONAL), eq(PEER_PATH)); verify(this.tx, times(0)).merge(eq(LogicalDatastoreType.OPERATIONAL), eq(TABLE_PATH), - eq(ImmutableNodes.leafNode(ATTRIBUTES_UPTODATE_FALSE.getNodeType(), Boolean.TRUE))); + eq(ImmutableNodes.leafNode(UPTODATE_NID, Boolean.TRUE))); } @Test @@ -268,8 +272,8 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { ribImpl.instantiateServiceInstance(); ribImpl.onGlobalContextUpdated(this.schemaService.getGlobalContext()); - final BGPPeer bgpPeer = new BGPPeer(this.tableRegistry, neighbor, ribImpl, PeerRole.Ibgp, null, - AFI_SAFIS_ADVERTIZED, Collections.emptySet()); + final BGPPeer bgpPeer = AbstractAddPathTest.configurePeer(this.tableRegistry, neighbor.getIpv4Address(), + ribImpl, null, PeerRole.Ibgp, this.serverRegistry, AFI_SAFIS_ADVERTIZED, Collections.emptySet()); bgpPeer.instantiateServiceInstance(); final BGPSessionImpl bgpSession = new BGPSessionImpl(bgpPeer, this.speakerListener, this.classicOpen, this.classicOpen.getHoldTimer(), null); @@ -277,8 +281,8 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { bgpPeer.onSessionUp(bgpSession); final Nlri n1 = new NlriBuilder().setPrefix(new Ipv4Prefix("8.0.1.0/28")).build(); - final Nlri n2 = new NlriBuilder().setPrefix( new Ipv4Prefix("127.0.0.1/32")).build(); - final Nlri n3 = new NlriBuilder().setPrefix( new Ipv4Prefix("2.2.2.2/24")).build(); + final Nlri n2 = new NlriBuilder().setPrefix(new Ipv4Prefix("127.0.0.1/32")).build(); + final Nlri n3 = new NlriBuilder().setPrefix(new Ipv4Prefix("2.2.2.2/24")).build(); final List nlris = Lists.newArrayList(n1, n2, n3); final UpdateBuilder wrongMessage = new UpdateBuilder(); wrongMessage.setNlri(nlris); @@ -300,7 +304,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { any(YangInstanceIdentifier.class), any(NormalizedNode.class)); verify(this.tx).merge(eq(LogicalDatastoreType.OPERATIONAL), eq(TABLE_PATH), - eq(ImmutableNodes.leafNode(ATTRIBUTES_UPTODATE_FALSE.getNodeType(), Boolean.TRUE))); + eq(ImmutableNodes.leafNode(UPTODATE_NID, Boolean.TRUE))); verify(this.tx, times(0)).delete(eq(LogicalDatastoreType.OPERATIONAL), eq(PEER_PATH)); } }