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)
@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() {
@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));