- TapiConnectivityImpl tapi = new TapiConnectivityImpl(this.serviceHandler);
- TapiTopologyImpl topo = new TapiTopologyImpl(this.dataBroker);
+ TapiLink tapiLink = new TapiLink(this.networkTransactionService);
+ TopologyUtils topologyUtils = new TopologyUtils(this.networkTransactionService, this.dataBroker, tapiLink);
+ ConnectivityUtils connectivityUtils = new ConnectivityUtils(this.serviceDataStoreOperations, new HashMap<>(),
+ tapiContext, this.networkTransactionService);
+ TapiInitialORMapping tapiInitialORMapping = new TapiInitialORMapping(topologyUtils, connectivityUtils,
+ tapiContext, this.serviceDataStoreOperations);
+ tapiInitialORMapping.performTopoInitialMapping();
+ tapiInitialORMapping.performServInitialMapping();
+
+ TapiConnectivityImpl tapi = new TapiConnectivityImpl(this.serviceHandler, tapiContext, connectivityUtils,
+ pceListenerImpl, rendererListenerImpl);
+ TapiTopologyImpl topo = new TapiTopologyImpl(this.dataBroker, tapiContext, topologyUtils, tapiLink);