X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Fprovider%2FTapiProviderTest.java;h=9427914c4aca2a6b2758ebde1968cf1384c37327;hb=5e89fe2242ea395f6aee61b1f060c7b6183aeb27;hp=76077e6fb6ffe52686f9091cab8da49686570a79;hpb=8b8db92bb0250af82d65ccb8185275d724a066ed;p=transportpce.git

diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
index 76077e6fb..9427914c4 100644
--- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
+++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java
@@ -16,24 +16,20 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
 import org.opendaylight.transportpce.tapi.impl.TapiProvider;
-import org.opendaylight.transportpce.tapi.listeners.TapiNetworkModelListenerImpl;
-import org.opendaylight.transportpce.tapi.listeners.TapiPceListenerImpl;
-import org.opendaylight.transportpce.tapi.listeners.TapiRendererListenerImpl;
-import org.opendaylight.transportpce.tapi.listeners.TapiServiceHandlerListenerImpl;
-import org.opendaylight.transportpce.tapi.topology.TapiNetconfTopologyListener;
-import org.opendaylight.transportpce.tapi.topology.TapiOrLinkListener;
-import org.opendaylight.transportpce.tapi.topology.TapiPortMappingListener;
-import org.opendaylight.transportpce.tapi.utils.TapiListener;
+import org.opendaylight.transportpce.tapi.topology.TapiNetworkModelService;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OrgOpenroadmServiceService;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TapiCommonService;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.TapiConnectivityService;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.notification.rev181210.TapiNotificationListener;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.TapiTopologyService;
 
 @ExtendWith(MockitoExtension.class)
@@ -43,28 +39,19 @@ public class TapiProviderTest extends AbstractTest {
     @Mock
     private RpcProviderService rpcProviderRegistry;
     @Mock
+    private NotificationService notificationService;
+    @Mock
+    private NotificationPublishService notificationPublishService;
+    @Mock
     private OrgOpenroadmServiceService serviceHandler;
     @Mock
     private ServiceDataStoreOperations serviceDataStoreOperations;
     @Mock
-    private TapiListener tapiListener;
-    @Mock
     private TransportpceTapinetworkutilsService tapiNetworkUtils;
     @Mock
-    private TapiPortMappingListener tapiPortMappingListener;
-    @Mock
-    private TapiNetconfTopologyListener topologyListener;
-    @Mock
-    private TapiOrLinkListener orLinkListener;
+    private TapiNotificationListener tapiNetworkModelListenerImpl;
     @Mock
-    private TapiPceListenerImpl pceListenerImpl;
-    @Mock
-    private TapiRendererListenerImpl rendererListenerImpl;
-    @Mock
-    private TapiServiceHandlerListenerImpl serviceHandlerListenerImpl;
-    @Mock
-    private TapiNetworkModelListenerImpl networkModelListener;
-
+    private TapiNetworkModelService tapiNetworkModelServiceImpl;
 
     @BeforeAll
     static void setUp() {
@@ -73,12 +60,9 @@ public class TapiProviderTest extends AbstractTest {
 
     @Test
     void testInitRegisterTapiToRpcRegistry() {
-        TapiProvider provider =  new TapiProvider(getDataBroker(), rpcProviderRegistry, serviceHandler,
-            serviceDataStoreOperations, tapiListener, networkTransactionService, topologyListener,
-            tapiPortMappingListener, tapiNetworkUtils, pceListenerImpl, rendererListenerImpl,
-            serviceHandlerListenerImpl, getNotificationService(), orLinkListener, networkModelListener);
-
-        provider.init();
+        TapiProvider provider =  new TapiProvider(getDataBroker(), rpcProviderRegistry, notificationService,
+            notificationPublishService, networkTransactionService, serviceHandler, serviceDataStoreOperations,
+            tapiNetworkUtils, tapiNetworkModelListenerImpl, tapiNetworkModelServiceImpl);
 
         verify(rpcProviderRegistry, times(1)).registerRpcImplementation(any(), any(TapiConnectivityService.class));
         verify(rpcProviderRegistry, times(2)).registerRpcImplementation(any(), any(TapiTopologyService.class));