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;
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.NetworkModelService;
import org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl;
+import org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthService;
+import org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthServiceImpl;
import org.opendaylight.transportpce.olm.OlmPowerServiceRpcImpl;
import org.opendaylight.transportpce.olm.OlmProvider;
import org.opendaylight.transportpce.olm.power.PowerMgmt;
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;
networkTransaction = new NetworkTransactionImpl(requestProcessor);
LOG.info("Creating PCE beans ...");
- PathComputationService pathComputationService = new PathComputationServiceImpl(networkTransaction,
- lightyServices.getBindingNotificationPublishService());
+ PathComputationService pathComputationService = new PathComputationServiceImpl(
+ networkTransaction,
+ lightyServices.getBindingNotificationPublishService(),
+ lightyServices.getAdapterContext().currentSerializer()
+ );
pceProvider = new PceProvider(lightyServices.getRpcProviderService(), pathComputationService);
LOG.info("Creating network-model beans ...");
PortMapping portMapping = initPortMapping(lightyServices, openRoadmInterfaces);
NetworkModelService networkModelService = new NetworkModelServiceImpl(networkTransaction, linkDiscoveryImpl,
portMapping);
+ NetworkModelWavelengthService networkModelWavelengthService =
+ new NetworkModelWavelengthServiceImpl(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);
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,
- olmPowerServiceRpc, lightyServices.getBindingDataBroker(), networkModelWavelengthService,
+ otnDeviceRendererService, olmPowerServiceRpc, lightyServices.getBindingDataBroker(),
lightyServices.getBindingNotificationPublishService());
servicehandlerProvider = new ServicehandlerProvider(lightyServices.getBindingDataBroker(),
lightyServices.getRpcProviderService(), lightyServices.getNotificationService(), pathComputationService,
- rendererServiceOperations, networkModelWavelengthService,
- lightyServices.getBindingNotificationPublishService());
- tapiProvider = initTapi(lightyServices, rendererServiceOperations, networkModelWavelengthService,
- pathComputationService);
+ rendererServiceOperations, lightyServices.getBindingNotificationPublishService());
+ tapiProvider = initTapi(lightyServices, rendererServiceOperations, pathComputationService);
}
@Override
*
* @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());
lightyServices.getBindingNotificationPublishService(), serviceDataStoreOperations);
ServiceHandlerOperations serviceHandlerOperations = new ServiceHandlerOperationsImpl(
lightyServices.getBindingDataBroker(), pathComputationService, rendererServiceOperations,
- lightyServices.getBindingNotificationPublishService(), pceListenerImpl, rendererListenerImpl,
- networkModelWavelengthService);
+ lightyServices.getBindingNotificationPublishService(), pceListenerImpl, rendererListenerImpl);
return new TapiProvider(lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(),
serviceHandlerOperations, new TapiListener());
}
*
* @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, olmPowerServiceRpc, lightyServices.getBindingDataBroker(),
- networkModelWavelengthService, lightyServices.getBindingNotificationPublishService());
+ deviceRendererService, otnDeviceRendererService, olmPowerServiceRpc,
+ lightyServices.getBindingDataBroker(), lightyServices.getBindingNotificationPublishService());
return new RendererProvider(lightyServices.getRpcProviderService(), deviceRendererRPC,
rendererServiceOperations);
}
OpenRoadmInterfaces openRoadmInterfaces, PortMapping portMapping) {
OpenRoadmInterface121 openRoadmInterface121 = new OpenRoadmInterface121(portMapping, openRoadmInterfaces);
OpenRoadmInterface221 openRoadmInterface221 = new OpenRoadmInterface221(portMapping, openRoadmInterfaces,
- new FixedFlexImpl());
+ new FixedFlexImpl(), new FlexGridImpl());
OpenRoadmOtnInterface221 openRoadmOtnInterface221 = new OpenRoadmOtnInterface221(portMapping,
openRoadmInterfaces);
return new OpenRoadmInterfaceFactory(mappingUtils, openRoadmInterface121, openRoadmInterface221,
* @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);
}
/**
deviceTransactionManager);
OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(
deviceTransactionManager);
+ OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(
+ deviceTransactionManager);
return new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils, openRoadmInterfacesImpl121,
- openRoadmInterfacesImpl221);
+ openRoadmInterfacesImpl221, openRoadmInterfacesImpl710);
}
/**
CrossConnectImpl221 crossConnectImpl221 = new CrossConnectImpl221(deviceTransactionManager);
return new CrossConnectImpl(deviceTransactionManager, mappingUtils, crossConnectImpl121, crossConnectImpl221);
}
-}
\ No newline at end of file
+}