Bump upstreams

[bgpcep.git] / bmp / bmp-impl / src / test / java / org / opendaylight / protocol / bmp / impl / app / BmpMonitorImplTest.java

diff --git a/bmp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java b/bmp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java
index 376d038c8e5bf2a6942f85fcd7c36cebee1ea3c1..16e367789aa3627c706d66de8efd74c892b9b5c9 100644 (file)
--- a/bmp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java
+++ b/bmp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java
@@ -46,9 +46,8 @@ import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBro
 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.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.parser.impl.BGPActivator;
 import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
@@ -57,6 +56,7 @@ import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext;
 import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContext;
 import org.opendaylight.protocol.bmp.impl.BmpDispatcherImpl;
 import org.opendaylight.protocol.bmp.impl.BmpHandlerFactory;
+import org.opendaylight.protocol.bmp.impl.BmpNettyGroups;
 import org.opendaylight.protocol.bmp.impl.session.DefaultBmpSessionFactory;
 import org.opendaylight.protocol.bmp.impl.spi.BmpMonitoringStation;
 import org.opendaylight.protocol.bmp.parser.BmpActivator;
@@ -91,6 +91,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.moni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.monitor.rev200120.peers.peer.Stats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.monitor.rev200120.routers.Router;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.monitor.rev200120.routers.RouterKey;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -125,9 +126,9 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
     private ClusterSingletonService singletonService;
     private ClusterSingletonService singletonService2;
     @Mock
-    private ClusterSingletonServiceRegistration singletonServiceRegistration;
+    private Registration singletonServiceRegistration;
     @Mock
-    private ClusterSingletonServiceRegistration singletonServiceRegistration2;
+    private Registration singletonServiceRegistration2;
     @Mock
     private ClusterSingletonServiceProvider clusterSSProv;
     @Mock
@@ -164,8 +165,7 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
         bmpActivator.start(ctx);
         msgRegistry = ctx.getBmpMessageRegistry();
 
-        dispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(), ctx,
-            new DefaultBmpSessionFactory());
+        dispatcher = new BmpDispatcherImpl(new BmpNettyGroups(), ctx, new DefaultBmpSessionFactory());
 
         final InetSocketAddress inetAddress = new InetSocketAddress(InetAddresses.forString(MONITOR_LOCAL_ADDRESS),
             MONITOR_LOCAL_PORT);
@@ -323,15 +323,15 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
             assertNotNull(peer.getPrePolicyRib());
             assertEquals(1, peer.getPrePolicyRib().nonnullTables().size());
             final Tables prePolicyTable = peer.getPrePolicyRib().nonnullTables().values().iterator().next();
-            assertEquals(Ipv4AddressFamily.class, prePolicyTable.getAfi());
-            assertEquals(UnicastSubsequentAddressFamily.class, prePolicyTable.getSafi());
+            assertEquals(Ipv4AddressFamily.VALUE, prePolicyTable.getAfi());
+            assertEquals(UnicastSubsequentAddressFamily.VALUE, prePolicyTable.getSafi());
             assertFalse(prePolicyTable.getAttributes().getUptodate());
 
             assertNotNull(peer.getPostPolicyRib());
             assertEquals(1, peer.getPostPolicyRib().nonnullTables().size());
             final Tables postPolicyTable = peer.getPrePolicyRib().nonnullTables().values().iterator().next();
-            assertEquals(Ipv4AddressFamily.class, postPolicyTable.getAfi());
-            assertEquals(UnicastSubsequentAddressFamily.class, postPolicyTable.getSafi());
+            assertEquals(Ipv4AddressFamily.VALUE, postPolicyTable.getAfi());
+            assertEquals(UnicastSubsequentAddressFamily.VALUE, postPolicyTable.getSafi());
             assertFalse(postPolicyTable.getAttributes().getUptodate());
 
             assertNotNull(peer.getPeerSession());