BGPCEP-730: Fix ModifiedNodeDoesNotExistException

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

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java
index be9fd44102326840e78b522f4689a87c42690ca1..65daec2108fad2c0772c075eca4498e785126498 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java
@@ -28,9 +28,6 @@ import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory;
 import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
 import org.opendaylight.protocol.bgp.rib.impl.RIBImpl;
 import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
@@ -58,8 +55,8 @@ import org.osgi.framework.ServiceRegistration;
 public class RibImplTest extends AbstractConfig {
     private static final List<AfiSafi> AFISAFIS = new ArrayList<>();
     private static final Long ALL_PATHS = 0L;
-    private static final BgpTableType TABLE_TYPE =
-            new BgpTableTypeImpl(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
+    private static final BgpTableType TABLE_TYPE = new BgpTableTypeImpl(Ipv4AddressFamily.class,
+            UnicastSubsequentAddressFamily.class);
     private static final Ipv4Address BGP_ID = new BgpId(new Ipv4Address("127.0.0.1"));
 
     static {
@@ -77,30 +74,16 @@ public class RibImplTest extends AbstractConfig {
     @Mock
     private DOMSchemaService domSchemaService;
     @Mock
-    private ClusterSingletonServiceProvider clusterSingletonServiceProvider;
-    @Mock
     private ListenerRegistration<?> dataTreeRegistration;
     @Mock
     private RIBSupport ribSupport;
     @Mock
     private ServiceRegistration<?> serviceRegistration;
 
-    private static Global createGlobal() {
-        return new GlobalBuilder()
-                .setAfiSafis(new AfiSafisBuilder().setAfiSafi(AFISAFIS).build())
-                .setConfig(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base
-                        .ConfigBuilder().setAs(AS).setRouterId(BGP_ID).build()).build();
-    }
-
     @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        Mockito.doAnswer(invocationOnMock -> {
-            RibImplTest.this.singletonService = (ClusterSingletonService) invocationOnMock.getArguments()[0];
-            return RibImplTest.this.singletonServiceRegistration;
-        }).when(this.clusterSingletonServiceProvider)
-                .registerClusterSingletonService(any(ClusterSingletonService.class));
 
         Mockito.doReturn(mock(GeneratedClassLoadingStrategy.class)).when(this.extension).getClassLoadingStrategy();
         Mockito.doReturn(this.ribSupport).when(this.extension).getRIBSupport(any(TablesKey.class));
@@ -124,17 +107,14 @@ public class RibImplTest extends AbstractConfig {
 
     @Test
     public void testRibImpl() throws Exception {
-        final RibImpl ribImpl = new RibImpl(this.clusterSingletonServiceProvider, this.extension, this.dispatcher,
+        final RibImpl ribImpl = new RibImpl(this.extension, this.dispatcher,
                 this.bindingCodecTreeFactory, this.domDataBroker, this.domSchemaService);
         ribImpl.setServiceRegistration(this.serviceRegistration);
         ribImpl.start(createGlobal(), "rib-test", this.tableTypeRegistry);
         verify(this.extension).getClassLoadingStrategy();
         verify(this.domDataBroker).getSupportedExtensions();
-        verify(this.clusterSingletonServiceProvider).registerClusterSingletonService(any());
         verify(this.domSchemaService).registerSchemaContextListener(any(RIBImpl.class));
-        this.singletonService.instantiateServiceInstance();
         assertEquals("RIBImpl{}", ribImpl.toString());
-        assertEquals(ServiceGroupIdentifier.create("rib-test-service-group"), ribImpl.getRibIServiceGroupIdentifier());
         assertEquals(Collections.singleton(new TablesKey(Ipv4AddressFamily.class,
                 UnicastSubsequentAddressFamily.class)), ribImpl.getLocalTablesKeys());
         assertNotNull(ribImpl.getImportPolicyPeerTracker());
@@ -153,4 +133,11 @@ public class RibImplTest extends AbstractConfig {
         verify(this.dataTreeRegistration).close();
         verify(this.serviceRegistration).unregister();
     }
+
+    private static Global createGlobal() {
+        return new GlobalBuilder()
+                .setAfiSafis(new AfiSafisBuilder().setAfiSafi(AFISAFIS).build())
+                .setConfig(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base
+                        .ConfigBuilder().setAs(AS).setRouterId(BGP_ID).build()).build();
+    }
 }
\ No newline at end of file