Remove RIBImpl's use of DataBroker

[bgpcep.git] / bgp / rib-impl / src / test / java / org / opendaylight / protocol / bgp / rib / impl / config / AbstractConfig.java

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
index 90d65f5bae9b4eb9a9516d638bd54ded28f609cf..d97d17d7765e5d0596e0a4b0aa5b0ef0bb18e502 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
@@ -10,20 +10,15 @@ package org.opendaylight.protocol.bgp.rib.impl.config;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 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 com.google.common.util.concurrent.FluentFuture;
 import io.netty.util.concurrent.Future;
 import java.net.InetSocketAddress;
 import java.util.Collections;
-import java.util.concurrent.Executor;
 import org.junit.Before;
 import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.opendaylight.mdsal.binding.api.TransactionChainListener;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
@@ -43,25 +38,26 @@ import org.opendaylight.protocol.bgp.rib.spi.BGPPeerTracker;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.protocol.concepts.KeyMapping;
 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;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
 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.Rib;
 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.RibKey;
 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.types.rev180329.BgpId;
-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.rev200120.BgpId;
+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.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.osgi.framework.ServiceRegistration;
 
 class AbstractConfig extends DefaultRibPoliciesMockTest {
-    protected static final AsNumber AS = new AsNumber(72L);
-    protected static final AsNumber LOCAL_AS = new AsNumber(73L);
+    protected static final AsNumber AS = new AsNumber(Uint32.valueOf(72));
+    protected static final AsNumber LOCAL_AS = new AsNumber(Uint32.valueOf(73));
     protected static final RibId RIB_ID = new RibId("test");
     static final TablesKey TABLES_KEY = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
     @Mock
@@ -96,12 +92,7 @@ class AbstractConfig extends DefaultRibPoliciesMockTest {
                 .params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib.class, new RibKey(RIB_ID))).when(this.rib)
                 .getInstanceIdentifier();
         doReturn(this.domTx).when(this.rib).createPeerDOMChain(any(DOMTransactionChainListener.class));
-        doAnswer(invocation -> {
-            final Object[] args = invocation.getArguments();
-            return getDataBroker().createTransactionChain((TransactionChainListener) args[0]);
-        }).when(this.rib).createPeerChain(any(TransactionChainListener.class));
 
-        doReturn(getDataBroker()).when(this.rib).getDataBroker();
         doReturn(AS).when(this.rib).getLocalAs();
         doReturn(mock(RIBSupportContextRegistry.class)).when(this.rib).getRibSupportContext();
         doReturn(Collections.emptySet()).when(this.rib).getLocalTablesKeys();
@@ -113,16 +104,8 @@ class AbstractConfig extends DefaultRibPoliciesMockTest {
                 any(YangInstanceIdentifier.class));
         doNothing().when(this.domDW).merge(eq(LogicalDatastoreType.OPERATIONAL),
                 any(YangInstanceIdentifier.class), any(NormalizedNode.class));
-        final FluentFuture<? extends CommitInfo> checkedFuture = mock(FluentFuture.class);
-        doAnswer(invocation -> {
-            final Runnable callback = (Runnable) invocation.getArguments()[0];
-            callback.run();
-            return null;
-        }).when(checkedFuture).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
-        doReturn(checkedFuture).when(this.domDW).commit();
-        doReturn(null).when(checkedFuture).get();
-        doReturn(true).when(checkedFuture).isDone();
-        doReturn("checkedFuture").when(checkedFuture).toString();
+        doReturn(CommitInfo.emptyFluentFuture()).when(this.domDW).commit();
+
         doReturn(YangInstanceIdentifier.of(Rib.QNAME)).when(this.rib).getYangRibId();
         doReturn(this.dataTreeChangeService).when(this.rib).getService();
         doReturn(this.listener).when(this.dataTreeChangeService).registerDataTreeChangeListener(any(), any());
@@ -132,17 +115,16 @@ class AbstractConfig extends DefaultRibPoliciesMockTest {
                 any(), anyInt(), any(KeyMapping.class));
         doReturn(this.dispatcher).when(this.rib).getDispatcher();
 
-        doReturn(java.util.Optional.of(new BgpTableTypeImpl(Ipv4AddressFamily.class,
-                UnicastSubsequentAddressFamily.class)))
+        doReturn(new BgpTableTypeImpl(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class))
                 .when(this.tableTypeRegistry).getTableType(any());
-        doReturn(java.util.Optional.of(TABLES_KEY)).when(this.tableTypeRegistry).getTableKey(any());
+        doReturn(TABLES_KEY).when(this.tableTypeRegistry).getTableKey(any());
         doReturn(Collections.singleton(new BgpTableTypeImpl(Ipv4AddressFamily.class,
                 UnicastSubsequentAddressFamily.class)))
                 .when(this.rib).getLocalTables();
 
-        doNothing().when(this.bgpPeerRegistry).addPeer(any(IpAddress.class),
+        doNothing().when(this.bgpPeerRegistry).addPeer(any(IpAddressNoZone.class),
                 any(BGPSessionListener.class), any(BGPSessionPreferences.class));
-        doNothing().when(this.bgpPeerRegistry).removePeer(any(IpAddress.class));
+        doNothing().when(this.bgpPeerRegistry).removePeer(any(IpAddressNoZone.class));
         doReturn("registry").when(this.bgpPeerRegistry).toString();
         doNothing().when(this.listener).close();
         doReturn(this.bgpPeerRegistry).when(this.dispatcher).getBGPPeerRegistry();