Code Review / bgpcep.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump upstreams
[bgpcep.git] / bgp / rib-impl / src / test / java / org / opendaylight / protocol / bgp / rib / impl / AbstractRIBTestSetup.java
diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java
index e019c4aad51ff3a6f0b8cd8a9a9ab6ae2f68299b..2dbf9d73c47f0a1cc678e24433d1aa792782848f 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java
@@ -14,14 +14,13 @@ import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
-import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.util.concurrent.FluentFuture;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.EventListener;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Executor;
 import org.junit.Before;
@@ -30,16 +29,14 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.mdsal.binding.dom.adapter.CurrentAdapterSerializer;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
-import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
 import org.opendaylight.protocol.bgp.inet.RIBActivator;
 import org.opendaylight.protocol.bgp.mode.impl.base.BasePathSelectionModeFactory;
 import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
@@ -58,6 +55,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv6AddressFamily;
 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.concepts.Registration;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -74,13 +72,9 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
 import org.opendaylight.yangtools.yang.data.tree.api.ModificationType;
 
 public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest {
-
-    static final Ipv4AddressFamily IPV4_AFI = Ipv4AddressFamily.VALUE;
-    private static final Ipv6AddressFamily IPV6_AFI = Ipv6AddressFamily.VALUE;
-    static final UnicastSubsequentAddressFamily SAFI = UnicastSubsequentAddressFamily.VALUE;
-    static final TablesKey KEY = new TablesKey(IPV4_AFI, SAFI);
     static final QName PREFIX_QNAME = QName.create(Ipv4Route.QNAME, "prefix").intern();
     private static final BgpId RIB_ID = new BgpId("127.0.0.1");
+
     private RIBImpl rib;
     private final RIBActivator a1 = new RIBActivator();
     @Mock
@@ -99,7 +93,7 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest {
     private FluentFuture<? extends CommitInfo> future;
 
     @Mock
-    private DOMDataTreeChangeService service;
+    private DataTreeChangeExtension service;
 
     @Mock
     private ClusterSingletonServiceProvider clusterSingletonServiceProvider;
@@ -114,26 +108,25 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest {
     public void mockRib() throws Exception {
         final RIBExtensionProviderContext context = new SimpleRIBExtensionProviderContext();
         final List<BgpTableType> localTables = new ArrayList<>();
-        localTables.add(new BgpTableTypeImpl(IPV4_AFI, SAFI));
-        localTables.add(new BgpTableTypeImpl(IPV6_AFI, SAFI));
+        localTables.add(new BgpTableTypeImpl(Ipv4AddressFamily.VALUE, UnicastSubsequentAddressFamily.VALUE));
+        localTables.add(new BgpTableTypeImpl(Ipv6AddressFamily.VALUE, UnicastSubsequentAddressFamily.VALUE));
 
         final CurrentAdapterSerializer serializer = mappingService.currentSerializer();
         a1.startRIBExtensionProvider(context, serializer);
 
         mockedMethods();
-        doReturn(mock(ClusterSingletonServiceRegistration.class)).when(clusterSingletonServiceProvider)
+        doReturn(mock(Registration.class)).when(clusterSingletonServiceProvider)
                 .registerClusterSingletonService(any(ClusterSingletonService.class));
         rib = new RIBImpl(tableRegistry, new RibId("test"), new AsNumber(Uint32.valueOf(5)), RIB_ID, context,
-                dispatcher, new ConstantCodecsRegistry(serializer), dom, policies,
-                localTables, Collections.singletonMap(KEY,
+            dispatcher, new ConstantCodecsRegistry(serializer), dom, policies, localTables,
+            Map.of(new TablesKey(Ipv4AddressFamily.VALUE, UnicastSubsequentAddressFamily.VALUE),
                 BasePathSelectionModeFactory.createBestPathSelectionStrategy()));
     }
 
     private void mockedMethods() throws Exception {
         MockitoAnnotations.initMocks(this);
         doReturn(new TestListenerRegistration()).when(service)
-                .registerDataTreeChangeListener(any(DOMDataTreeIdentifier.class),
-                        any(ClusteredDOMDataTreeChangeListener.class));
+                .registerTreeChangeListener(any(DOMDataTreeIdentifier.class), any(DOMDataTreeChangeListener.class));
         doNothing().when(domTransWrite).put(eq(LogicalDatastoreType.OPERATIONAL),
                 any(YangInstanceIdentifier.class), any(NormalizedNode.class));
         doNothing().when(domTransWrite).delete(eq(LogicalDatastoreType.OPERATIONAL),
@@ -144,9 +137,9 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest {
         doReturn(domTransWrite).when(domChain).newWriteOnlyTransaction();
         doNothing().when(getTransaction()).put(eq(LogicalDatastoreType.OPERATIONAL),
                 eq(YangInstanceIdentifier.of(BgpRib.QNAME)), any(NormalizedNode.class));
-        doReturn(ImmutableClassToInstanceMap.of(DOMDataTreeChangeService.class, service)).when(dom)
-            .getExtensions();
-        doReturn(domChain).when(dom).createMergingTransactionChain(any(DOMTransactionChainListener.class));
+        doReturn(service).when(dom).extension(DataTreeChangeExtension.class);
+        doReturn(domChain).when(dom).createMergingTransactionChain();
+        doNothing().when(domChain).addCallback(any());
         doReturn(Optional.empty()).when(future).get();
         doReturn(future).when(domTransWrite).commit();
         doCallRealMethod().when(future).addCallback(any(), any());
@@ -159,7 +152,7 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest {
         final DataTreeCandidate candidate = mock(DataTreeCandidate.class);
         final DataTreeCandidateNode rootNode = mock(DataTreeCandidateNode.class);
         doReturn(rootNode).when(candidate).getRootNode();
-        doReturn(type).when(rootNode).getModificationType();
+        doReturn(type).when(rootNode).modificationType();
         doCallRealMethod().when(rootNode).toString();
         doReturn(target).when(candidate).getRootPath();
         doCallRealMethod().when(candidate).toString();
@@ -174,12 +167,12 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest {
                     .withNodeIdentifier(new NodeIdentifier(PREFIX_QNAME)).withValue(p).build());
 
             final DataTreeCandidateNode child = mock(DataTreeCandidateNode.class);
-            doReturn(createIdentifier(p)).when(child).getIdentifier();
-            doReturn(java.util.Optional.of(b.build())).when(child).getDataAfter();
-            doReturn(type).when(child).getModificationType();
+            doReturn(createIdentifier(p)).when(child).name();
+            doReturn(b.build()).when(child).dataAfter();
+            doReturn(type).when(child).modificationType();
             children.add(child);
         }
-        doReturn(children).when(rootNode).getChildNodes();
+        doReturn(children).when(rootNode).childNodes();
         col.add(candidate);
         return col;
     }
@@ -198,7 +191,7 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest {
         return domTransWrite;
     }
 
-    private static class TestListenerRegistration implements ListenerRegistration<EventListener> {
+    private static final class TestListenerRegistration implements ListenerRegistration<EventListener> {
         @Override
         public EventListener getInstance() {
             return null;
BGP/PCEP protocol library