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=f3b37acb46f2b8c189072049dfc344db3ed1880a;hb=0414e9fec8fef0acf68cf2a98d73c79c1ffa4860;hp=842f15eee088134451583ff8e2217b544cf2dbe4;hpb=a5674b310f25344ead7c1202aabd5e79205104f5;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 842f15eee..f3b37acb4 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 @@ -9,8 +9,6 @@ package io.lighty.controllers.tpce.module; import io.lighty.core.controller.api.AbstractLightyModule; import io.lighty.core.controller.api.LightyServices; -import org.opendaylight.transportpce.servicehandler.catalog.CatalogDataStoreOperations; -import org.opendaylight.transportpce.servicehandler.catalog.CatalogDataStoreOperationsImpl; import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl; import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl121; @@ -34,18 +32,15 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa import org.opendaylight.transportpce.nbinotifications.impl.NbiNotificationsProvider; import org.opendaylight.transportpce.networkmodel.NetConfTopologyListener; import org.opendaylight.transportpce.networkmodel.NetworkModelProvider; +import org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl; import org.opendaylight.transportpce.networkmodel.listeners.PortMappingListener; -import org.opendaylight.transportpce.networkmodel.service.FrequenciesService; import org.opendaylight.transportpce.networkmodel.service.FrequenciesServiceImpl; import org.opendaylight.transportpce.networkmodel.service.NetworkModelService; import org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl; import org.opendaylight.transportpce.olm.OlmPowerServiceRpcImpl; import org.opendaylight.transportpce.olm.OlmProvider; -import org.opendaylight.transportpce.olm.power.PowerMgmt; import org.opendaylight.transportpce.olm.power.PowerMgmtImpl; -import org.opendaylight.transportpce.olm.service.OlmPowerService; import org.opendaylight.transportpce.olm.service.OlmPowerServiceImpl; -import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumer; import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumerImpl; import org.opendaylight.transportpce.pce.impl.PceProvider; import org.opendaylight.transportpce.pce.service.PathComputationService; @@ -62,6 +57,7 @@ import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOpe import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperationsImpl; import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl; import org.opendaylight.transportpce.renderer.rpcs.TransportPCEServicePathRPCImpl; +import org.opendaylight.transportpce.servicehandler.catalog.CatalogDataStoreOperationsImpl; import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl; import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerProvider; import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl; @@ -78,15 +74,14 @@ import org.opendaylight.transportpce.tapi.topology.TapiNetworkUtilsImpl; import org.opendaylight.transportpce.tapi.utils.TapiLink; import org.opendaylight.transportpce.tapi.utils.TapiLinkImpl; 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.rev211210.OrgOpenroadmServiceService; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OrgOpenroadmServiceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class TransportPCEImpl extends AbstractLightyModule implements TransportPCE { private static final Logger LOG = LoggerFactory.getLogger(TransportPCEImpl.class); - private static final long MAX_DURATION_TO_SUBMIT_TRANSACTION = 1500; + private static final long MAX_TIME_FOR_TRANSACTION = 1500; // transaction beans // cannot use interface for DeviceTransactionManagerImpl // because implementation has additional public methods ... @@ -107,54 +102,63 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP // nbi-notifications beans private NbiNotificationsProvider nbiNotificationsProvider; - public TransportPCEImpl(LightyServices lightyServices, boolean activateNbiNotification, boolean activateTapi, - String olmtimer1, String olmtimer2) { + public TransportPCEImpl( + LightyServices lightyServices, boolean activateNbiNotification, boolean activateTapi, + String olmtimer1, String olmtimer2) { LOG.info("Initializing transaction providers ..."); - deviceTransactionManager = new DeviceTransactionManagerImpl( - lightyServices.getBindingMountPointService(), MAX_DURATION_TO_SUBMIT_TRANSACTION); - networkTransaction = new NetworkTransactionImpl(lightyServices.getBindingDataBroker()); + deviceTransactionManager = + new DeviceTransactionManagerImpl(lightyServices.getBindingMountPointService(), MAX_TIME_FOR_TRANSACTION); + var lgServBDB = lightyServices.getBindingDataBroker(); + networkTransaction = new NetworkTransactionImpl(lgServBDB); LOG.info("Creating network-model beans ..."); PortMapping portMapping = initPortMapping(lightyServices); + var lgServBNPS = lightyServices.getBindingNotificationPublishService(); NetworkModelService networkModelService = new NetworkModelServiceImpl( - lightyServices.getBindingDataBroker(), + lgServBDB, deviceTransactionManager, networkTransaction, portMapping, - lightyServices.getBindingNotificationPublishService()); + lgServBNPS); new NetConfTopologyListener( - networkModelService, lightyServices.getBindingDataBroker(), deviceTransactionManager, portMapping); + networkModelService, lgServBDB, deviceTransactionManager, portMapping); new PortMappingListener(networkModelService); + var lgServRPS = lightyServices.getRpcProviderService(); + var lgServNS = lightyServices.getNotificationService(); networkModelProvider = new NetworkModelProvider( - networkTransaction, lightyServices.getBindingDataBroker(), - lightyServices.getRpcProviderService(), networkModelService, deviceTransactionManager, portMapping, - lightyServices.getNotificationService(), - new FrequenciesServiceImpl(lightyServices.getBindingDataBroker())); + networkTransaction, + lgServBDB, + lgServRPS, + networkModelService, deviceTransactionManager, portMapping, + lgServNS, + new FrequenciesServiceImpl(lgServBDB), + new NetworkUtilsImpl(lgServBDB)); LOG.info("Creating PCE beans ..."); // TODO: pass those parameters through command line PathComputationService pathComputationService = new PathComputationServiceImpl( networkTransaction, - lightyServices.getBindingNotificationPublishService(), + lgServBNPS, new GnpyConsumerImpl( "http://127.0.0.1:8008", "gnpy", "gnpy", lightyServices.getAdapterContext().currentSerializer()), portMapping); - pceProvider = new PceProvider(lightyServices.getRpcProviderService(), pathComputationService); + pceProvider = new PceProvider(lgServRPS, pathComputationService); LOG.info("Creating OLM beans ..."); - MappingUtils mappingUtils = new MappingUtilsImpl(lightyServices.getBindingDataBroker()); + MappingUtils mappingUtils = new MappingUtilsImpl(lgServBDB); CrossConnect crossConnect = initCrossConnect(mappingUtils); OpenRoadmInterfaces openRoadmInterfaces = initOpenRoadmInterfaces(mappingUtils, portMapping); TransportpceOlmService olmPowerServiceRpc = new OlmPowerServiceRpcImpl( new OlmPowerServiceImpl( - lightyServices.getBindingDataBroker(), + lgServBDB, new PowerMgmtImpl( openRoadmInterfaces, crossConnect, deviceTransactionManager, portMapping, Long.valueOf(olmtimer1).longValue(), Long.valueOf(olmtimer2).longValue()), deviceTransactionManager, portMapping, mappingUtils, openRoadmInterfaces)); - olmProvider = new OlmProvider(lightyServices.getRpcProviderService(), olmPowerServiceRpc); + olmProvider = new OlmProvider(lgServRPS, olmPowerServiceRpc); LOG.info("Creating renderer beans ..."); initOpenRoadmFactory(mappingUtils, openRoadmInterfaces, portMapping); DeviceRendererService deviceRendererService = new DeviceRendererServiceImpl( - lightyServices.getBindingDataBroker(), deviceTransactionManager, openRoadmInterfaces, crossConnect, + lgServBDB, + deviceTransactionManager, openRoadmInterfaces, crossConnect, mappingUtils, portMapping); OtnDeviceRendererService otnDeviceRendererService = new OtnDeviceRendererServiceImpl( crossConnect, openRoadmInterfaces, deviceTransactionManager, mappingUtils, portMapping); @@ -164,30 +168,30 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP LOG.info("Creating service-handler beans ..."); RendererServiceOperations rendererServiceOperations = new RendererServiceOperationsImpl( deviceRendererService, otnDeviceRendererService, olmPowerServiceRpc, - lightyServices.getBindingDataBroker(), - lightyServices.getBindingNotificationPublishService(), + lgServBDB, + lgServBNPS, portMapping); ServiceDataStoreOperations serviceDataStoreOperations = - new ServiceDataStoreOperationsImpl(lightyServices.getBindingDataBroker()); - RendererListenerImpl rendererListenerImpl = new RendererListenerImpl( - pathComputationService, lightyServices.getBindingNotificationPublishService(), networkModelService); + new ServiceDataStoreOperationsImpl(lgServBDB); + RendererListenerImpl rendererListenerImpl = + new RendererListenerImpl(pathComputationService, lgServBNPS, networkModelService); PceListenerImpl pceListenerImpl = new PceListenerImpl( rendererServiceOperations, pathComputationService, - lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); + lgServBNPS, serviceDataStoreOperations); NetworkModelListenerImpl networkModelListenerImpl = new NetworkModelListenerImpl( - lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); + lgServBNPS, serviceDataStoreOperations); OrgOpenroadmServiceService servicehandler = new ServicehandlerImpl( pathComputationService, rendererServiceOperations, - lightyServices.getBindingNotificationPublishService(), pceListenerImpl, + lgServBNPS, pceListenerImpl, rendererListenerImpl, networkModelListenerImpl, serviceDataStoreOperations, new CatalogDataStoreOperationsImpl(networkTransaction)); servicehandlerProvider = new ServicehandlerProvider( - lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(), - lightyServices.getNotificationService(), serviceDataStoreOperations, pceListenerImpl, - rendererListenerImpl, networkModelListenerImpl, lightyServices.getBindingNotificationPublishService(), + lgServBDB, lgServRPS, + lgServNS, serviceDataStoreOperations, pceListenerImpl, + rendererListenerImpl, networkModelListenerImpl, lgServBNPS, servicehandler, new ServiceListener( - servicehandler, serviceDataStoreOperations, lightyServices.getBindingNotificationPublishService())); + servicehandler, serviceDataStoreOperations, lgServBNPS)); if (activateTapi) { LOG.info("Creating tapi beans ..."); TapiLink tapiLink = new TapiLinkImpl(networkTransaction); @@ -195,17 +199,17 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP tapiProvider = initTapi( lightyServices, servicehandler, networkTransaction, serviceDataStoreOperations, new TapiNetworkModelListenerImpl( - networkTransaction, lightyServices.getBindingNotificationPublishService()), + networkTransaction, lgServBNPS), tapiLink, new TapiNetworkModelServiceImpl( networkTransaction, deviceTransactionManager, tapiLink, - lightyServices.getBindingNotificationPublishService())); + lgServBNPS)); } if (activateNbiNotification) { LOG.info("Creating nbi-notifications beans ..."); nbiNotificationsProvider = new NbiNotificationsProvider( - null, null, lightyServices.getRpcProviderService(), - lightyServices.getNotificationService(), lightyServices.getAdapterContext().currentSerializer(), + null, null, lgServRPS, + lgServNS, lightyServices.getAdapterContext().currentSerializer(), networkTransaction); } }