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=fa368050309d9ba629b32025c5a614cd357ff197;hb=336faa20de5184eaf8b0c1e84d22b4a708381235;hp=eb40d203596f4b33d86be2a25448273b9e29bded;hpb=5e3675cf1ce1d119c758cb2d8513be591c1e6b78;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 eb40d2035..fa3680503 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 @@ -14,14 +14,13 @@ import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl; import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl121; import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl221; import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl; -import org.opendaylight.transportpce.common.fixedflex.FixedFlexImpl; -import org.opendaylight.transportpce.common.fixedflex.FlexGridImpl; import org.opendaylight.transportpce.common.mapping.MappingUtils; import org.opendaylight.transportpce.common.mapping.MappingUtilsImpl; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.mapping.PortMappingImpl; import org.opendaylight.transportpce.common.mapping.PortMappingVersion121; import org.opendaylight.transportpce.common.mapping.PortMappingVersion221; +import org.opendaylight.transportpce.common.mapping.PortMappingVersion710; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.common.network.RequestProcessor; @@ -29,10 +28,13 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl221; +import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl710; import org.opendaylight.transportpce.networkmodel.NetConfTopologyListener; import org.opendaylight.transportpce.networkmodel.NetworkModelProvider; import org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl; import org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery; +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; @@ -44,8 +46,6 @@ import org.opendaylight.transportpce.olm.service.OlmPowerServiceImpl; import org.opendaylight.transportpce.pce.impl.PceProvider; import org.opendaylight.transportpce.pce.service.PathComputationService; import org.opendaylight.transportpce.pce.service.PathComputationServiceImpl; -import org.opendaylight.transportpce.renderer.NetworkModelWavelengthService; -import org.opendaylight.transportpce.renderer.NetworkModelWavelengthServiceImpl; import org.opendaylight.transportpce.renderer.RendererProvider; import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface121; import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface221; @@ -60,17 +60,18 @@ import org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererS import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperationsImpl; import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl; +import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl; import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerProvider; +import org.opendaylight.transportpce.servicehandler.listeners.NetworkModelListenerImpl; import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl; import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl; -import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperations; -import org.opendaylight.transportpce.servicehandler.service.ServiceHandlerOperationsImpl; import org.opendaylight.transportpce.tapi.impl.TapiProvider; 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.rev170418.TransportpceOlmService; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.OrgOpenroadmServiceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -120,11 +121,14 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP OpenRoadmInterfaces openRoadmInterfaces = initOpenRoadmInterfaces(mappingUtils); PortMapping portMapping = initPortMapping(lightyServices, openRoadmInterfaces); NetworkModelService networkModelService = new NetworkModelServiceImpl(networkTransaction, linkDiscoveryImpl, - portMapping); + portMapping, lightyServices.getBindingNotificationPublishService()); + FrequenciesService networkModelWavelengthService = + new FrequenciesServiceImpl(lightyServices.getBindingDataBroker()); NetConfTopologyListener netConfTopologyListener = new NetConfTopologyListener(networkModelService, lightyServices.getBindingDataBroker(), deviceTransactionManager); networkModelProvider = new NetworkModelProvider(networkTransaction, lightyServices.getBindingDataBroker(), - lightyServices.getRpcProviderService(), networkutilsServiceImpl, netConfTopologyListener); + lightyServices.getRpcProviderService(), networkutilsServiceImpl, netConfTopologyListener, + lightyServices.getNotificationService(), networkModelWavelengthService); LOG.info("Creating OLM beans ..."); CrossConnect crossConnect = initCrossConnect(mappingUtils); @@ -143,21 +147,29 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP openRoadmInterfaces, crossConnect, portMapping, networkModelService); OtnDeviceRendererService otnDeviceRendererService = new OtnDeviceRendererServiceImpl(openRoadmInterfaceFactory, crossConnect, openRoadmInterfaces, deviceTransactionManager, networkModelService); - NetworkModelWavelengthService networkModelWavelengthService = new NetworkModelWavelengthServiceImpl( - lightyServices.getBindingDataBroker()); - rendererProvider = initRenderer(lightyServices, olmPowerServiceRpc, networkModelWavelengthService, - deviceRendererService, otnDeviceRendererService); + rendererProvider = initRenderer(lightyServices, olmPowerServiceRpc, deviceRendererService, + otnDeviceRendererService); LOG.info("Creating service-handler beans ..."); RendererServiceOperations rendererServiceOperations = new RendererServiceOperationsImpl(deviceRendererService, otnDeviceRendererService, olmPowerServiceRpc, lightyServices.getBindingDataBroker(), - networkModelWavelengthService, lightyServices.getBindingNotificationPublishService()); - servicehandlerProvider = new ServicehandlerProvider(lightyServices.getBindingDataBroker(), - lightyServices.getRpcProviderService(), lightyServices.getNotificationService(), pathComputationService, - rendererServiceOperations, networkModelWavelengthService, lightyServices.getBindingNotificationPublishService()); - tapiProvider = initTapi(lightyServices, rendererServiceOperations, networkModelWavelengthService, - pathComputationService); + ServiceDataStoreOperations serviceDataStoreOperations = new ServiceDataStoreOperationsImpl( + lightyServices.getBindingDataBroker()); + RendererListenerImpl rendererListenerImpl = new RendererListenerImpl(pathComputationService, + lightyServices.getBindingNotificationPublishService()); + PceListenerImpl pceListenerImpl = new PceListenerImpl(rendererServiceOperations, pathComputationService, + lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); + NetworkModelListenerImpl networkModelListenerImpl = new NetworkModelListenerImpl( + lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); + ServicehandlerImpl servicehandler = new ServicehandlerImpl(lightyServices.getBindingDataBroker(), + pathComputationService, rendererServiceOperations, lightyServices.getBindingNotificationPublishService(), + pceListenerImpl, rendererListenerImpl, networkModelListenerImpl, serviceDataStoreOperations); + servicehandlerProvider = new ServicehandlerProvider(lightyServices.getBindingDataBroker(), + lightyServices.getRpcProviderService(), lightyServices.getNotificationService(), + serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl, networkModelListenerImpl, + servicehandler); + tapiProvider = initTapi(lightyServices, servicehandler); } @Override @@ -203,24 +215,11 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP * * @param lightyServices LightyServices * @param rendererServiceOperations RendererServiceOperations - * @param networkModelWavelengthService NetworkModelWavelengthService * @return TapiProvider instance */ - private TapiProvider initTapi(LightyServices lightyServices, RendererServiceOperations rendererServiceOperations, - NetworkModelWavelengthService networkModelWavelengthService, - PathComputationService pathComputationService) { - RendererListenerImpl rendererListenerImpl = new RendererListenerImpl(pathComputationService, - lightyServices.getBindingNotificationPublishService()); - ServiceDataStoreOperations serviceDataStoreOperations = new ServiceDataStoreOperationsImpl( - lightyServices.getBindingDataBroker()); - PceListenerImpl pceListenerImpl = new PceListenerImpl(rendererServiceOperations, pathComputationService, - lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations); - ServiceHandlerOperations serviceHandlerOperations = new ServiceHandlerOperationsImpl( - lightyServices.getBindingDataBroker(), pathComputationService, rendererServiceOperations, - lightyServices.getBindingNotificationPublishService(), pceListenerImpl, rendererListenerImpl, - networkModelWavelengthService); + private TapiProvider initTapi(LightyServices lightyServices, OrgOpenroadmServiceService servicehandler) { return new TapiProvider(lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(), - serviceHandlerOperations, new TapiListener()); + servicehandler, new TapiListener()); } /** @@ -228,20 +227,17 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP * * @param lightyServices LightyServices * @param olmPowerServiceRpc TransportpceOlmService - * @param networkModelWavelengthService NetworkModelWavelengthService * @param deviceRendererService DeviceRendererService * @param otnDeviceRendererService OtnDeviceRendererService * @return RendererProvider instance */ private RendererProvider initRenderer(LightyServices lightyServices, TransportpceOlmService olmPowerServiceRpc, - NetworkModelWavelengthService networkModelWavelengthService, DeviceRendererService deviceRendererService, - OtnDeviceRendererService otnDeviceRendererService) { + DeviceRendererService deviceRendererService, OtnDeviceRendererService otnDeviceRendererService) { DeviceRendererRPCImpl deviceRendererRPC = new DeviceRendererRPCImpl(deviceRendererService, otnDeviceRendererService); RendererServiceOperationsImpl rendererServiceOperations = new RendererServiceOperationsImpl( deviceRendererService, otnDeviceRendererService, olmPowerServiceRpc, - lightyServices.getBindingDataBroker(), networkModelWavelengthService, - lightyServices.getBindingNotificationPublishService()); + lightyServices.getBindingDataBroker(), lightyServices.getBindingNotificationPublishService()); return new RendererProvider(lightyServices.getRpcProviderService(), deviceRendererRPC, rendererServiceOperations); } @@ -257,8 +253,7 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP private OpenRoadmInterfaceFactory initOpenRoadmFactory(MappingUtils mappingUtils, OpenRoadmInterfaces openRoadmInterfaces, PortMapping portMapping) { OpenRoadmInterface121 openRoadmInterface121 = new OpenRoadmInterface121(portMapping, openRoadmInterfaces); - OpenRoadmInterface221 openRoadmInterface221 = new OpenRoadmInterface221(portMapping, openRoadmInterfaces, - new FixedFlexImpl(), new FlexGridImpl()); + OpenRoadmInterface221 openRoadmInterface221 = new OpenRoadmInterface221(portMapping, openRoadmInterfaces); OpenRoadmOtnInterface221 openRoadmOtnInterface221 = new OpenRoadmOtnInterface221(portMapping, openRoadmInterfaces); return new OpenRoadmInterfaceFactory(mappingUtils, openRoadmInterface121, openRoadmInterface221, @@ -273,11 +268,14 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP * @return PortMapping instance */ private PortMapping initPortMapping(LightyServices lightyServices, OpenRoadmInterfaces openRoadmInterfaces) { + PortMappingVersion710 portMappingVersion710 = new PortMappingVersion710(lightyServices.getBindingDataBroker(), + deviceTransactionManager, openRoadmInterfaces); PortMappingVersion221 portMappingVersion221 = new PortMappingVersion221(lightyServices.getBindingDataBroker(), deviceTransactionManager, openRoadmInterfaces); PortMappingVersion121 portMappingVersion121 = new PortMappingVersion121(lightyServices.getBindingDataBroker(), deviceTransactionManager, openRoadmInterfaces); - return new PortMappingImpl(lightyServices.getBindingDataBroker(), portMappingVersion221, portMappingVersion121); + return new PortMappingImpl(lightyServices.getBindingDataBroker(), portMappingVersion710, + portMappingVersion221, portMappingVersion121); } /** @@ -291,8 +289,10 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP deviceTransactionManager); OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221( deviceTransactionManager); + OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710( + deviceTransactionManager); return new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils, openRoadmInterfacesImpl121, - openRoadmInterfacesImpl221); + openRoadmInterfacesImpl221, openRoadmInterfacesImpl710); } /**