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.crossconnect.CrossConnectImpl710;
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.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.common.openroadminterfaces.OpenRoadmInterfacesImpl221;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl710;
+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.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.GnpyConsumerImpl;
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;
import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory;
// Adding OTN interface
-import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmOtnInterface221;
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.catalog.CatalogDataStoreOperationsImpl;
+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.listeners.ServiceListener;
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.transportpce.tapi.listeners.TapiNetworkModelListenerImpl;
+import org.opendaylight.transportpce.tapi.topology.TapiNetworkModelService;
+import org.opendaylight.transportpce.tapi.topology.TapiNetworkModelServiceImpl;
+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.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 ...
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;
- public TransportPCEImpl(LightyServices lightyServices) {
+ 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);
+ 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(
+ lgServBDB,
+ deviceTransactionManager, networkTransaction, portMapping,
+ lgServBNPS);
+ new NetConfTopologyListener(
+ networkModelService, lgServBDB, deviceTransactionManager, portMapping);
+ new PortMappingListener(networkModelService);
+ var lgServRPS = lightyServices.getRpcProviderService();
+ var lgServNS = lightyServices.getNotificationService();
+ networkModelProvider = new NetworkModelProvider(
+ 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(),
- lightyServices.getAdapterContext().currentSerializer()
- );
- pceProvider = new PceProvider(lightyServices.getRpcProviderService(), pathComputationService);
-
- LOG.info("Creating network-model beans ...");
- R2RLinkDiscovery linkDiscoveryImpl = new R2RLinkDiscovery(lightyServices.getBindingDataBroker(),
- deviceTransactionManager, networkTransaction);
- TransportpceNetworkutilsService networkutilsServiceImpl = new NetworkUtilsImpl(
- lightyServices.getBindingDataBroker());
- MappingUtils mappingUtils = new MappingUtilsImpl(lightyServices.getBindingDataBroker());
- OpenRoadmInterfaces openRoadmInterfaces = initOpenRoadmInterfaces(mappingUtils);
- PortMapping portMapping = initPortMapping(lightyServices, openRoadmInterfaces);
- NetworkModelService networkModelService = new NetworkModelServiceImpl(networkTransaction, linkDiscoveryImpl,
+ lgServBNPS,
+ new GnpyConsumerImpl(
+ "http://127.0.0.1:8008", "gnpy", "gnpy", lightyServices.getAdapterContext().currentSerializer()),
portMapping);
- NetConfTopologyListener netConfTopologyListener = new NetConfTopologyListener(networkModelService,
- lightyServices.getBindingDataBroker(), deviceTransactionManager);
- networkModelProvider = new NetworkModelProvider(networkTransaction, lightyServices.getBindingDataBroker(),
- lightyServices.getRpcProviderService(), networkutilsServiceImpl, netConfTopologyListener);
+ pceProvider = new PceProvider(lgServRPS, pathComputationService);
LOG.info("Creating OLM beans ...");
+ MappingUtils mappingUtils = new MappingUtilsImpl(lgServBDB);
CrossConnect crossConnect = initCrossConnect(mappingUtils);
- PowerMgmt powerMgmt = new PowerMgmtImpl(lightyServices.getBindingDataBroker(), openRoadmInterfaces,
- crossConnect, deviceTransactionManager);
- OlmPowerService olmPowerService = new OlmPowerServiceImpl(lightyServices.getBindingDataBroker(), powerMgmt,
- deviceTransactionManager, portMapping, mappingUtils, openRoadmInterfaces);
- olmProvider = new OlmProvider(lightyServices.getRpcProviderService(), olmPowerService);
- TransportpceOlmService olmPowerServiceRpc = new OlmPowerServiceRpcImpl(olmPowerService);
-
+ OpenRoadmInterfaces openRoadmInterfaces = initOpenRoadmInterfaces(mappingUtils, portMapping);
+ TransportpceOlmService olmPowerServiceRpc = new OlmPowerServiceRpcImpl(
+ new OlmPowerServiceImpl(
+ lgServBDB,
+ new PowerMgmtImpl(
+ openRoadmInterfaces, crossConnect, deviceTransactionManager,
+ portMapping, Long.valueOf(olmtimer1).longValue(), Long.valueOf(olmtimer2).longValue()),
+ deviceTransactionManager, portMapping, mappingUtils, openRoadmInterfaces));
+ olmProvider = new OlmProvider(lgServRPS, 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, networkModelService);
- OtnDeviceRendererService otnDeviceRendererService = new OtnDeviceRendererServiceImpl(openRoadmInterfaceFactory,
- crossConnect, openRoadmInterfaces, deviceTransactionManager, networkModelService);
- NetworkModelWavelengthService networkModelWavelengthService = new NetworkModelWavelengthServiceImpl(
- lightyServices.getBindingDataBroker());
- rendererProvider = initRenderer(lightyServices, olmPowerServiceRpc, networkModelWavelengthService,
- deviceRendererService, otnDeviceRendererService);
+ lgServBDB,
+ deviceTransactionManager, openRoadmInterfaces, crossConnect,
+ mappingUtils, portMapping);
+ OtnDeviceRendererService otnDeviceRendererService = new OtnDeviceRendererServiceImpl(
+ crossConnect, openRoadmInterfaces, deviceTransactionManager, mappingUtils, portMapping);
+ rendererProvider = initRenderer(
+ lightyServices, olmPowerServiceRpc, deviceRendererService, otnDeviceRendererService, portMapping);
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);
+ RendererServiceOperations rendererServiceOperations = new RendererServiceOperationsImpl(
+ deviceRendererService, otnDeviceRendererService, olmPowerServiceRpc,
+ lgServBDB,
+ lgServBNPS,
+ portMapping);
+ ServiceDataStoreOperations serviceDataStoreOperations =
+ new ServiceDataStoreOperationsImpl(lgServBDB);
+ RendererListenerImpl rendererListenerImpl =
+ new RendererListenerImpl(pathComputationService, lgServBNPS, networkModelService);
+ PceListenerImpl pceListenerImpl = new PceListenerImpl(
+ rendererServiceOperations, pathComputationService,
+ lgServBNPS, serviceDataStoreOperations);
+ NetworkModelListenerImpl networkModelListenerImpl = new NetworkModelListenerImpl(
+ lgServBNPS, serviceDataStoreOperations);
+ OrgOpenroadmServiceService servicehandler = new ServicehandlerImpl(
+ pathComputationService, rendererServiceOperations,
+ lgServBNPS, pceListenerImpl,
+ rendererListenerImpl, networkModelListenerImpl, serviceDataStoreOperations,
+ new CatalogDataStoreOperationsImpl(networkTransaction));
+ servicehandlerProvider = new ServicehandlerProvider(
+ lgServBDB, lgServRPS,
+ lgServNS, serviceDataStoreOperations, pceListenerImpl,
+ rendererListenerImpl, networkModelListenerImpl, lgServBNPS,
+ servicehandler,
+ new ServiceListener(
+ servicehandler, serviceDataStoreOperations, lgServBNPS));
+ if (activateTapi) {
+ LOG.info("Creating tapi beans ...");
+ TapiLink tapiLink = new TapiLinkImpl(networkTransaction);
+ new TapiNetworkUtilsImpl(networkTransaction, tapiLink);
+ tapiProvider = initTapi(
+ lightyServices, servicehandler, networkTransaction, serviceDataStoreOperations,
+ new TapiNetworkModelListenerImpl(
+ networkTransaction, lgServBNPS),
+ tapiLink,
+ new TapiNetworkModelServiceImpl(
+ networkTransaction, deviceTransactionManager, tapiLink,
+ lgServBNPS));
+ }
+ if (activateNbiNotification) {
+ LOG.info("Creating nbi-notifications beans ...");
+ nbiNotificationsProvider = new NbiNotificationsProvider(
+ null, null, lgServRPS,
+ lgServNS, 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 ...");
+ }
+ if (nbiNotificationsProvider != null) {
+ LOG.info("Initializing nbi-notifications provider ...");
+ }
LOG.info("Init done.");
return true;
}
@Override
protected boolean stopProcedure() {
- 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;
}
- /**
- * Init tapi provider beans.
- *
- * @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);
- return new TapiProvider(lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(),
- serviceHandlerOperations, new TapiListener());
+ private TapiProvider initTapi(
+ LightyServices lightyServices, OrgOpenroadmServiceService servicehandler,
+ NetworkTransactionService networkTransactionService, ServiceDataStoreOperations serviceDataStoreOperations,
+ TapiNetworkModelListenerImpl tapiNetworkModelListenerImpl, TapiLink tapiLink,
+ TapiNetworkModelService tapiNetworkModelService) {
+ return new TapiProvider(
+ lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(),
+ lightyServices.getNotificationService(), lightyServices.getBindingNotificationPublishService(),
+ networkTransactionService, servicehandler, serviceDataStoreOperations,
+ new TapiNetworkUtilsImpl(networkTransactionService, tapiLink),
+ tapiNetworkModelListenerImpl, tapiNetworkModelService);
}
- /**
- * Init renderer provider beans.
- *
- * @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) {
- DeviceRendererRPCImpl deviceRendererRPC = new DeviceRendererRPCImpl(deviceRendererService,
- otnDeviceRendererService);
- RendererServiceOperationsImpl rendererServiceOperations = new RendererServiceOperationsImpl(
- deviceRendererService, otnDeviceRendererService, olmPowerServiceRpc,
- lightyServices.getBindingDataBroker(), networkModelWavelengthService,
- lightyServices.getBindingNotificationPublishService());
- return new RendererProvider(lightyServices.getRpcProviderService(), deviceRendererRPC,
- rendererServiceOperations);
+ private RendererProvider initRenderer(
+ LightyServices lightyServices, TransportpceOlmService olmPowerServiceRpc,
+ DeviceRendererService deviceRendererService, OtnDeviceRendererService otnDeviceRendererService,
+ PortMapping portMapping) {
+ return new RendererProvider(
+ lightyServices.getRpcProviderService(), deviceRendererService,
+ otnDeviceRendererService,
+ new DeviceRendererRPCImpl(deviceRendererService, otnDeviceRendererService),
+ new TransportPCEServicePathRPCImpl(
+ new RendererServiceOperationsImpl(
+ deviceRendererService, otnDeviceRendererService, olmPowerServiceRpc,
+ lightyServices.getBindingDataBroker(), lightyServices.getBindingNotificationPublishService(),
+ portMapping)));
}
- /**
- * Init OpenRoadmInterfaceFactory.
- *
- * @param mappingUtils MappingUtils
- * @param openRoadmInterfaces OpenRoadmInterfaces
- * @param portMapping PortMapping
- * @return OpenRoadmInterfaceFactory instance
- */
- 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());
- OpenRoadmOtnInterface221 openRoadmOtnInterface221 = new OpenRoadmOtnInterface221(portMapping,
- openRoadmInterfaces);
- return new OpenRoadmInterfaceFactory(mappingUtils, openRoadmInterface121, openRoadmInterface221,
- openRoadmOtnInterface221);
+ private OpenRoadmInterfaceFactory initOpenRoadmFactory(
+ MappingUtils mappingUtils, OpenRoadmInterfaces openRoadmInterfaces, PortMapping portMapping) {
+ return new OpenRoadmInterfaceFactory(mappingUtils, portMapping, openRoadmInterfaces);
}
- /**
- * Init PortMapping.
- *
- * @param lightyServices LightyServices
- * @param openRoadmInterfaces OpenRoadmInterfaces
- * @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(), portMappingVersion710,
- portMappingVersion221, portMappingVersion121);
+ private PortMapping initPortMapping(LightyServices lightyServices) {
+ PortMappingVersion710 portMappingVersion710 =
+ new PortMappingVersion710(lightyServices.getBindingDataBroker(), deviceTransactionManager);
+ PortMappingVersion221 portMappingVersion221 =
+ new PortMappingVersion221(lightyServices.getBindingDataBroker(), deviceTransactionManager);
+ PortMappingVersion121 portMappingVersion121 =
+ new PortMappingVersion121(lightyServices.getBindingDataBroker(), deviceTransactionManager);
+ return new PortMappingImpl(
+ lightyServices.getBindingDataBroker(), portMappingVersion710, portMappingVersion221, portMappingVersion121);
}
- /**
- * Init OpenRoadmInterfaces.
- *
- * @param mappingUtils MappingUtils
- * @return OpenRoadmInterfaces instance
- */
- private OpenRoadmInterfaces initOpenRoadmInterfaces(MappingUtils mappingUtils) {
- OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(
- deviceTransactionManager);
- OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(
- deviceTransactionManager);
- OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(
- deviceTransactionManager);
- return new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils, openRoadmInterfacesImpl121,
- openRoadmInterfacesImpl221, openRoadmInterfacesImpl710);
+ private OpenRoadmInterfaces initOpenRoadmInterfaces(MappingUtils mappingUtils, PortMapping portMapping) {
+ OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121 =
+ new OpenRoadmInterfacesImpl121(deviceTransactionManager);
+ OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221 =
+ new OpenRoadmInterfacesImpl221(deviceTransactionManager, portMapping);
+ OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710 =
+ new OpenRoadmInterfacesImpl710(deviceTransactionManager, portMapping);
+ return new OpenRoadmInterfacesImpl(
+ deviceTransactionManager, mappingUtils,
+ openRoadmInterfacesImpl121, openRoadmInterfacesImpl221, openRoadmInterfacesImpl710);
+
}
- /**
- * Init CrossConnect.
- *
- * @param mappingUtils MappingUtils
- * @return CrossConnect instance
- */
private CrossConnect initCrossConnect(MappingUtils mappingUtils) {
CrossConnectImpl121 crossConnectImpl121 = new CrossConnectImpl121(deviceTransactionManager);
CrossConnectImpl221 crossConnectImpl221 = new CrossConnectImpl221(deviceTransactionManager);
- return new CrossConnectImpl(deviceTransactionManager, mappingUtils, crossConnectImpl121, crossConnectImpl221);
+ CrossConnectImpl710 crossConnectImpl710 = new CrossConnectImpl710(deviceTransactionManager);
+ return new CrossConnectImpl(
+ deviceTransactionManager, mappingUtils,
+ crossConnectImpl121, crossConnectImpl221, crossConnectImpl710);
}
}