X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=lighty%2Fsrc%2Fmain%2Fjava%2Fio%2Flighty%2Fcontrollers%2Ftpce%2Fmodule%2FTransportPCEImpl.java;h=fb3a8f828100277b2932919a53d8751062bbe377;hb=refs%2Fchanges%2F85%2F101585%2F7;hp=4bee0e15b17e11a7dcf2ad8544365e871871ef19;hpb=04dc7aa524f9912005ba3bb07dba4b08dbb10a5a;p=transportpce.git diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java index 4bee0e15b..fb3a8f828 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java @@ -80,6 +80,7 @@ import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOper import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl; import org.opendaylight.transportpce.tapi.R2RTapiLinkDiscovery; 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; @@ -94,7 +95,7 @@ import org.opendaylight.transportpce.tapi.utils.TapiListener; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.TransportpceOlmService; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OrgOpenroadmServiceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -115,10 +116,10 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP private final OlmProvider olmProvider; // renderer beans private final RendererProvider rendererProvider; - // T-api - private final TapiProvider tapiProvider; // service-handler beans private final ServicehandlerProvider servicehandlerProvider; + // T-api + private TapiProvider tapiProvider; // nbi-notifications beans private NbiNotificationsProvider nbiNotificationsProvider; /** @@ -128,7 +129,7 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP "ServiceHandler", "RendererListener"); private final List publisherAlarmList = Arrays.asList("ServiceListener"); - public TransportPCEImpl(LightyServices lightyServices, boolean activateNbiNotification, + public TransportPCEImpl(LightyServices lightyServices, boolean activateNbiNotification, boolean activateTapi, String olmtimer1, String olmtimer2) { LOG.info("Initializing transaction providers ..."); deviceTransactionManager = new DeviceTransactionManagerImpl(lightyServices.getBindingMountPointService(), @@ -181,7 +182,7 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP portMapping); DeviceRendererService deviceRendererService = new DeviceRendererServiceImpl( lightyServices.getBindingDataBroker(), deviceTransactionManager, openRoadmInterfaceFactory, - openRoadmInterfaces, crossConnect, portMapping, networkModelService); + openRoadmInterfaces, crossConnect, portMapping); OtnDeviceRendererService otnDeviceRendererService = new OtnDeviceRendererServiceImpl(openRoadmInterfaceFactory, crossConnect, openRoadmInterfaces, deviceTransactionManager, networkModelService); rendererProvider = initRenderer(lightyServices, olmPowerServiceRpc, deviceRendererService, @@ -197,41 +198,45 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP lightyServices.getBindingNotificationPublishService(), networkModelService); PceListenerImpl pceListenerImpl = new PceListenerImpl(rendererServiceOperations, pathComputationService, lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); - ServiceListener serviceListener = new ServiceListener(lightyServices.getBindingDataBroker(), - lightyServices.getBindingNotificationPublishService()); NetworkModelListenerImpl networkModelListenerImpl = new NetworkModelListenerImpl( lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); ServicehandlerImpl servicehandler = new ServicehandlerImpl(lightyServices.getBindingDataBroker(), pathComputationService, rendererServiceOperations, lightyServices.getBindingNotificationPublishService(), pceListenerImpl, rendererListenerImpl, networkModelListenerImpl, serviceDataStoreOperations); + ServiceListener serviceListener = new ServiceListener(servicehandler, serviceDataStoreOperations, + lightyServices.getBindingNotificationPublishService()); servicehandlerProvider = new ServicehandlerProvider(lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(), lightyServices.getNotificationService(), serviceDataStoreOperations, pceListenerImpl, serviceListener, rendererListenerImpl, networkModelListenerImpl, servicehandler); + if (activateTapi) { + LOG.info("Creating tapi beans ..."); + TapiLink tapiLink = new TapiLink(networkTransaction); + R2RTapiLinkDiscovery tapilinkDiscoveryImpl = new R2RTapiLinkDiscovery(networkTransaction, + deviceTransactionManager, tapiLink); + TapiRendererListenerImpl tapiRendererListenerImpl = new TapiRendererListenerImpl(lightyServices + .getBindingDataBroker()); + TapiPceListenerImpl tapiPceListenerImpl = new TapiPceListenerImpl(lightyServices.getBindingDataBroker()); + TapiServiceHandlerListenerImpl tapiServiceHandlerListener = new TapiServiceHandlerListenerImpl( + lightyServices.getBindingDataBroker()); + TransportpceTapinetworkutilsService tapiNetworkutilsServiceImpl = new TapiNetworkUtilsImpl( + networkTransaction, tapiLink); + TapiNetworkModelService tapiNetworkModelService = new TapiNetworkModelServiceImpl( + tapilinkDiscoveryImpl, networkTransaction, tapiLink, + lightyServices.getBindingNotificationPublishService()); + TapiNetconfTopologyListener tapiNetConfTopologyListener = + new TapiNetconfTopologyListener(tapiNetworkModelService); + TapiOrLinkListener orLinkListener = new TapiOrLinkListener(tapiLink, networkTransaction); + TapiPortMappingListener tapiPortMappingListener = + new TapiPortMappingListener(tapiNetworkModelService); + TapiNetworkModelListenerImpl tapiNetworkModelListenerImpl = + new TapiNetworkModelListenerImpl(networkTransaction); - LOG.info("Creating tapi beans ..."); - TapiLink tapiLink = new TapiLink(networkTransaction); - R2RTapiLinkDiscovery tapilinkDiscoveryImpl = new R2RTapiLinkDiscovery(networkTransaction, - deviceTransactionManager, tapiLink); - TapiRendererListenerImpl tapiRendererListenerImpl = new TapiRendererListenerImpl(lightyServices - .getBindingDataBroker()); - TapiPceListenerImpl tapiPceListenerImpl = new TapiPceListenerImpl(lightyServices.getBindingDataBroker()); - TapiServiceHandlerListenerImpl tapiServiceHandlerListener = new TapiServiceHandlerListenerImpl(lightyServices - .getBindingDataBroker()); - TransportpceTapinetworkutilsService tapiNetworkutilsServiceImpl = new TapiNetworkUtilsImpl( - networkTransaction, tapiLink); - TapiNetworkModelService tapiNetworkModelService = new TapiNetworkModelServiceImpl( - tapilinkDiscoveryImpl, networkTransaction, tapiLink); - TapiNetconfTopologyListener tapiNetConfTopologyListener = - new TapiNetconfTopologyListener(tapiNetworkModelService); - TapiOrLinkListener orLinkListener = new TapiOrLinkListener(tapiLink, networkTransaction); - TapiPortMappingListener tapiPortMappingListener = - new TapiPortMappingListener(tapiNetworkModelService); - - tapiProvider = initTapi(lightyServices, servicehandler, networkTransaction, serviceDataStoreOperations, - tapiNetConfTopologyListener, tapiPortMappingListener, tapiNetworkutilsServiceImpl, tapiPceListenerImpl, - tapiRendererListenerImpl, tapiServiceHandlerListener, lightyServices.getNotificationService(), - orLinkListener); + tapiProvider = initTapi(lightyServices, servicehandler, networkTransaction, serviceDataStoreOperations, + tapiNetConfTopologyListener, tapiPortMappingListener, tapiNetworkutilsServiceImpl, + tapiPceListenerImpl, tapiRendererListenerImpl, tapiServiceHandlerListener, + lightyServices.getNotificationService(), orLinkListener, tapiNetworkModelListenerImpl); + } if (activateNbiNotification) { LOG.info("Creating nbi-notifications beans ..."); nbiNotificationsProvider = new NbiNotificationsProvider( @@ -252,8 +257,10 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP rendererProvider.init(); LOG.info("Initializing service-handler provider ..."); servicehandlerProvider.init(); - LOG.info("Initializing tapi provider ..."); - tapiProvider.init(); + if (tapiProvider != null) { + LOG.info("Initializing tapi provider ..."); + tapiProvider.init(); + } if (nbiNotificationsProvider != null) { LOG.info("Initializing nbi-notifications provider ..."); nbiNotificationsProvider.init(); @@ -264,10 +271,14 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP @Override protected boolean stopProcedure() { - nbiNotificationsProvider.close(); - LOG.info("Shutting down nbi-notifications provider ..."); - tapiProvider.close(); - LOG.info("Shutting down service-handler provider ..."); + if (nbiNotificationsProvider != null) { + nbiNotificationsProvider.close(); + LOG.info("Shutting down nbi-notifications provider ..."); + } + if (tapiProvider != null) { + tapiProvider.close(); + LOG.info("Shutting down service-handler provider ..."); + } servicehandlerProvider.close(); LOG.info("Shutting down renderer provider ..."); rendererProvider.close(); @@ -292,11 +303,13 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP TransportpceTapinetworkutilsService tapiNetworkutilsServiceImpl, TapiPceListenerImpl pceListenerImpl, TapiRendererListenerImpl rendererListenerImpl, TapiServiceHandlerListenerImpl serviceHandlerListenerImpl, - NotificationService notificationService, TapiOrLinkListener orLinkListener) { + NotificationService notificationService, TapiOrLinkListener orLinkListener, + TapiNetworkModelListenerImpl tapiNetworkModelListenerImpl) { return new TapiProvider(lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(), servicehandler, serviceDataStoreOperations, new TapiListener(), networkTransactionService, tapiNetConfTopologyListener, tapiPortMappingListener, tapiNetworkutilsServiceImpl, pceListenerImpl, - rendererListenerImpl, serviceHandlerListenerImpl, notificationService, orLinkListener); + rendererListenerImpl, serviceHandlerListenerImpl, notificationService, orLinkListener, + tapiNetworkModelListenerImpl); } private RendererProvider initRenderer(LightyServices lightyServices, TransportpceOlmService olmPowerServiceRpc,