X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FNetworkModelProvider.java;h=5b406b14872f00f500ef29b0e503fac76337d160;hb=refs%2Fchanges%2F45%2F95545%2F12;hp=4dcf192afc3bc6ccd7512a2aeef270e789101fae;hpb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java index 4dcf192af..5b406b148 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java @@ -15,6 +15,7 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.network.NetworkTransactionService; +import org.opendaylight.transportpce.networkmodel.listeners.PortMappingListener; import org.opendaylight.transportpce.networkmodel.listeners.ServiceHandlerListener; import org.opendaylight.transportpce.networkmodel.service.FrequenciesService; import org.opendaylight.transportpce.networkmodel.util.TpceNetwork; @@ -42,16 +43,18 @@ public class NetworkModelProvider { private final TransportpceNetworkutilsService networkutilsService; private final NetConfTopologyListener topologyListener; private ListenerRegistration dataTreeChangeListenerRegistration; + private ListenerRegistration mappingListenerRegistration; private ObjectRegistration networkutilsServiceRpcRegistration; private TpceNetwork tpceNetwork; private ListenerRegistration serviceHandlerListenerRegistration; private NotificationService notificationService; private FrequenciesService frequenciesService; + private PortMappingListener portMappingListener; public NetworkModelProvider(NetworkTransactionService networkTransactionService, final DataBroker dataBroker, final RpcProviderService rpcProviderService, final TransportpceNetworkutilsService networkutilsService, final NetConfTopologyListener topologyListener, NotificationService notificationService, - FrequenciesService frequenciesService) { + FrequenciesService frequenciesService, PortMappingListener portMappingListener) { this.dataBroker = dataBroker; this.rpcProviderService = rpcProviderService; this.networkutilsService = networkutilsService; @@ -59,6 +62,7 @@ public class NetworkModelProvider { this.tpceNetwork = new TpceNetwork(networkTransactionService); this.notificationService = notificationService; this.frequenciesService = frequenciesService; + this.portMappingListener = portMappingListener; } /** @@ -70,9 +74,11 @@ public class NetworkModelProvider { tpceNetwork.createLayer(NetworkUtils.UNDERLAY_NETWORK_ID); tpceNetwork.createLayer(NetworkUtils.OVERLAY_NETWORK_ID); tpceNetwork.createLayer(NetworkUtils.OTN_NETWORK_ID); - dataTreeChangeListenerRegistration = - dataBroker.registerDataTreeChangeListener(DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, + dataTreeChangeListenerRegistration = dataBroker.registerDataTreeChangeListener( + DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, InstanceIdentifiers.NETCONF_TOPOLOGY_II.child(Node.class)), topologyListener); + mappingListenerRegistration = dataBroker.registerDataTreeChangeListener( + DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, MAPPING_II), portMappingListener); networkutilsServiceRpcRegistration = rpcProviderService.registerRpcImplementation(TransportpceNetworkutilsService.class, networkutilsService); TransportpceServicehandlerListener serviceHandlerListner = @@ -88,6 +94,9 @@ public class NetworkModelProvider { if (dataTreeChangeListenerRegistration != null) { dataTreeChangeListenerRegistration.close(); } + if (mappingListenerRegistration != null) { + mappingListenerRegistration.close(); + } if (networkutilsServiceRpcRegistration != null) { networkutilsServiceRpcRegistration.close(); }