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.OpenRoadmInterfaces;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121;
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.R2RLinkDiscovery;
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.pce.service.PathComputationService;
import org.opendaylight.transportpce.pce.service.PathComputationServiceImpl;
import org.opendaylight.transportpce.renderer.RendererProvider;
-import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface121;
-import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface221;
-import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface710;
import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory;
// Adding OTN interface
-import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmOtnInterface221;
-import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmOtnInterface710;
import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService;
import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererServiceImpl;
import org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererService;
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.renderer.rpcs.TransportPCEServicePathRPCImpl;
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.ServiceListener;
import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
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;
import org.opendaylight.transportpce.tapi.topology.TapiOrLinkListener;
import org.opendaylight.transportpce.tapi.topology.TapiPortMappingListener;
import org.opendaylight.transportpce.tapi.utils.TapiLink;
+import org.opendaylight.transportpce.tapi.utils.TapiLinkImpl;
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.rev211210.OrgOpenroadmServiceService;
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;
/**
"ServiceHandler", "RendererListener");
private final List<String> 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(),
MAX_DURATION_TO_SUBMIT_TRANSACTION);
- RequestProcessor requestProcessor = new RequestProcessor(lightyServices.getBindingDataBroker());
- networkTransaction = new NetworkTransactionImpl(requestProcessor);
+ networkTransaction = new NetworkTransactionImpl(lightyServices.getBindingDataBroker());
LOG.info("Creating network-model beans ...");
- R2RLinkDiscovery linkDiscoveryImpl = new R2RLinkDiscovery(lightyServices.getBindingDataBroker(),
- deviceTransactionManager, networkTransaction);
- TransportpceNetworkutilsService networkutilsServiceImpl = new NetworkUtilsImpl(
- lightyServices.getBindingDataBroker());
PortMapping portMapping = initPortMapping(lightyServices);
- NetworkModelService networkModelService = new NetworkModelServiceImpl(networkTransaction, linkDiscoveryImpl,
- portMapping, lightyServices.getBindingNotificationPublishService());
- FrequenciesService networkModelWavelengthService =
- new FrequenciesServiceImpl(lightyServices.getBindingDataBroker());
- NetConfTopologyListener netConfTopologyListener = new NetConfTopologyListener(networkModelService,
+ NetworkModelService networkModelService = new NetworkModelServiceImpl(lightyServices.getBindingDataBroker(),
+ deviceTransactionManager, networkTransaction, portMapping,
+ lightyServices.getBindingNotificationPublishService());
+ FrequenciesService networkModelWavelengthService = new FrequenciesServiceImpl(
+ lightyServices.getBindingDataBroker());
+ new NetConfTopologyListener(networkModelService,
lightyServices.getBindingDataBroker(), deviceTransactionManager, portMapping);
- PortMappingListener portMappingListener = new PortMappingListener(networkModelService);
+ new PortMappingListener(networkModelService);
networkModelProvider = new NetworkModelProvider(networkTransaction, lightyServices.getBindingDataBroker(),
- lightyServices.getRpcProviderService(), networkutilsServiceImpl, netConfTopologyListener,
- lightyServices.getNotificationService(), networkModelWavelengthService, portMappingListener);
+ lightyServices.getRpcProviderService(), networkModelService, deviceTransactionManager, portMapping,
+ lightyServices.getNotificationService(), networkModelWavelengthService);
LOG.info("Creating PCE beans ...");
// TODO: pass those parameters through command line
MappingUtils mappingUtils = new MappingUtilsImpl(lightyServices.getBindingDataBroker());
CrossConnect crossConnect = initCrossConnect(mappingUtils);
OpenRoadmInterfaces openRoadmInterfaces = initOpenRoadmInterfaces(mappingUtils, portMapping);
- PowerMgmt powerMgmt = new PowerMgmtImpl(lightyServices.getBindingDataBroker(), openRoadmInterfaces,
- crossConnect, deviceTransactionManager, olmtimer1, olmtimer2);
+ PowerMgmt powerMgmt = new PowerMgmtImpl(openRoadmInterfaces, crossConnect, deviceTransactionManager,
+ portMapping, Long.valueOf(olmtimer1).longValue(), Long.valueOf(olmtimer2).longValue());
OlmPowerService olmPowerService = new OlmPowerServiceImpl(lightyServices.getBindingDataBroker(), powerMgmt,
deviceTransactionManager, portMapping, mappingUtils, openRoadmInterfaces);
- olmProvider = new OlmProvider(lightyServices.getRpcProviderService(), olmPowerService);
TransportpceOlmService olmPowerServiceRpc = new OlmPowerServiceRpcImpl(olmPowerService);
+ olmProvider = new OlmProvider(lightyServices.getRpcProviderService(), olmPowerServiceRpc);
LOG.info("Creating renderer beans ...");
- OpenRoadmInterfaceFactory openRoadmInterfaceFactory = initOpenRoadmFactory(mappingUtils, openRoadmInterfaces,
- portMapping);
+ initOpenRoadmFactory(mappingUtils, openRoadmInterfaces, portMapping);
DeviceRendererService deviceRendererService = new DeviceRendererServiceImpl(
- lightyServices.getBindingDataBroker(), deviceTransactionManager, openRoadmInterfaceFactory,
- openRoadmInterfaces, crossConnect, portMapping);
- OtnDeviceRendererService otnDeviceRendererService = new OtnDeviceRendererServiceImpl(openRoadmInterfaceFactory,
- crossConnect, openRoadmInterfaces, deviceTransactionManager, networkModelService);
+ lightyServices.getBindingDataBroker(), deviceTransactionManager, openRoadmInterfaces, crossConnect,
+ mappingUtils, portMapping);
+ OtnDeviceRendererService otnDeviceRendererService = new OtnDeviceRendererServiceImpl(crossConnect,
+ openRoadmInterfaces, deviceTransactionManager, mappingUtils, portMapping);
rendererProvider = initRenderer(lightyServices, olmPowerServiceRpc, deviceRendererService,
otnDeviceRendererService, portMapping);
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);
+ ServicehandlerImpl servicehandler = new ServicehandlerImpl(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);
+ serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl, networkModelListenerImpl,
+ lightyServices.getBindingNotificationPublishService(), servicehandler, serviceListener);
+ if (activateTapi) {
+ LOG.info("Creating tapi beans ...");
+ TapiLink tapiLink = new TapiLinkImpl(networkTransaction);
+ TapiRendererListenerImpl tapiRendererListenerImpl = new TapiRendererListenerImpl(lightyServices
+ .getBindingDataBroker(), lightyServices.getBindingNotificationPublishService());
+ TapiPceListenerImpl tapiPceListenerImpl = new TapiPceListenerImpl(lightyServices.getBindingDataBroker());
+ TapiServiceHandlerListenerImpl tapiServiceHandlerListener = new TapiServiceHandlerListenerImpl(
+ lightyServices.getBindingDataBroker());
+ TransportpceTapinetworkutilsService tapiNetworkutilsServiceImpl = new TapiNetworkUtilsImpl(
+ networkTransaction, tapiLink);
+ TapiNetworkModelService tapiNetworkModelService = new TapiNetworkModelServiceImpl(networkTransaction,
+ deviceTransactionManager, tapiLink, lightyServices.getBindingNotificationPublishService());
+ TapiNetconfTopologyListener tapiNetConfTopologyListener =
+ new TapiNetconfTopologyListener(tapiNetworkModelService);
+ TapiOrLinkListener orLinkListener = new TapiOrLinkListener(tapiLink, networkTransaction);
+ TapiPortMappingListener tapiPortMappingListener =
+ new TapiPortMappingListener(tapiNetworkModelService);
+ TapiNetworkModelListenerImpl tapiNetworkModelListenerImpl =
+ new TapiNetworkModelListenerImpl(networkTransaction,
+ lightyServices.getBindingNotificationPublishService());
- 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(
- publisherServiceList, publisherAlarmList, null, null, lightyServices.getRpcProviderService(),
- lightyServices.getNotificationService(), lightyServices.getAdapterContext().currentSerializer());
+ publisherServiceList, publisherAlarmList, null, null, lightyServices.getRpcProviderService(),
+ lightyServices.getNotificationService(), lightyServices.getAdapterContext().currentSerializer(),
+ networkTransaction);
}
}
@Override
protected boolean initProcedure() {
- LOG.info("Initializing PCE provider ...");
- pceProvider.init();
- LOG.info("Initializing network-model provider ...");
- networkModelProvider.init();
- LOG.info("Initializing OLM provider ...");
- olmProvider.init();
- LOG.info("Initializing renderer provider ...");
- 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();
@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();
LOG.info("Shutting down PCE provider ...");
pceProvider.close();
LOG.info("Shutting down transaction providers ...");
- networkTransaction.close();
deviceTransactionManager.preDestroy();
LOG.info("Shutdown done.");
return true;
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,
deviceRendererService, otnDeviceRendererService, olmPowerServiceRpc,
lightyServices.getBindingDataBroker(), lightyServices.getBindingNotificationPublishService(),
portMapping);
- return new RendererProvider(lightyServices.getRpcProviderService(), deviceRendererRPC,
- rendererServiceOperations);
+ return new RendererProvider(lightyServices.getRpcProviderService(), deviceRendererService,
+ otnDeviceRendererService, deviceRendererRPC,
+ new TransportPCEServicePathRPCImpl(rendererServiceOperations));
}
private OpenRoadmInterfaceFactory initOpenRoadmFactory(MappingUtils mappingUtils,
OpenRoadmInterfaces openRoadmInterfaces, PortMapping portMapping) {
- OpenRoadmInterface121 openRoadmInterface121 = new OpenRoadmInterface121(portMapping, openRoadmInterfaces);
- OpenRoadmInterface221 openRoadmInterface221 = new OpenRoadmInterface221(portMapping, openRoadmInterfaces);
- OpenRoadmInterface710 openRoadmInterface710 = new OpenRoadmInterface710(portMapping, openRoadmInterfaces);
- OpenRoadmOtnInterface221 openRoadmOtnInterface221 = new OpenRoadmOtnInterface221(portMapping,
- openRoadmInterfaces);
- OpenRoadmOtnInterface710 openRoadmOtnInterface710 = new OpenRoadmOtnInterface710(portMapping,
- openRoadmInterfaces);
- return new OpenRoadmInterfaceFactory(mappingUtils, openRoadmInterface121, openRoadmInterface221,
- openRoadmInterface710, openRoadmOtnInterface221, openRoadmOtnInterface710);
+ return new OpenRoadmInterfaceFactory(mappingUtils, portMapping, openRoadmInterfaces);
}
private PortMapping initPortMapping(LightyServices lightyServices) {
OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(
deviceTransactionManager);
OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(
- deviceTransactionManager, portMapping, portMapping.getPortMappingVersion221());
+ deviceTransactionManager, portMapping);
OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(
- deviceTransactionManager, portMapping, portMapping.getPortMappingVersion710());
+ deviceTransactionManager, portMapping);
return new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils, openRoadmInterfacesImpl121,
openRoadmInterfacesImpl221, openRoadmInterfacesImpl710);
+
}
private CrossConnect initCrossConnect(MappingUtils mappingUtils) {
Code Review / transportpce.git / blobdiff