*/
package org.opendaylight.transportpce.networkmodel;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.transportpce.common.InstanceIdentifiers;
+import org.opendaylight.transportpce.common.network.NetworkTransactionService;
import org.opendaylight.transportpce.networkmodel.util.ClliNetwork;
+import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory;
import org.opendaylight.transportpce.networkmodel.util.OpenRoadmNetwork;
-import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static final Logger LOG = LoggerFactory.getLogger(NetworkModelProvider.class);
+ private NetworkTransactionService networkTransactionService;
private final DataBroker dataBroker;
- private final RpcProviderRegistry rpcProviderRegistry;
+ private final RpcProviderService rpcProviderService;
private final TransportpceNetworkutilsService networkutilsService;
private final NetConfTopologyListener topologyListener;
- private final OpenRoadmTopology openRoadmTopology;
+ private final OpenRoadmFactory openRoadmFactory;
private ListenerRegistration<NetConfTopologyListener> dataTreeChangeListenerRegistration;
- private BindingAwareBroker.RpcRegistration<TransportpceNetworkutilsService> networkutilsServiceRpcRegistration;
+ private ObjectRegistration<TransportpceNetworkutilsService> networkutilsServiceRpcRegistration;
- public NetworkModelProvider(final DataBroker dataBroker, final RpcProviderRegistry rpcProviderRegistry,
+ public NetworkModelProvider(NetworkTransactionService networkTransactionService,
+ final DataBroker dataBroker, final RpcProviderService rpcProviderService,
final TransportpceNetworkutilsService networkutilsService, final NetConfTopologyListener topologyListener,
- OpenRoadmTopology openRoadmTopology) {
+ OpenRoadmFactory openRoadmFactory) {
+ this.networkTransactionService = networkTransactionService;
this.dataBroker = dataBroker;
- this.rpcProviderRegistry = rpcProviderRegistry;
+ this.rpcProviderService = rpcProviderService;
this.networkutilsService = networkutilsService;
this.topologyListener = topologyListener;
- this.openRoadmTopology = openRoadmTopology;
+ this.openRoadmFactory = openRoadmFactory;
}
/**
LOG.info("NetworkModelProvider Session Initiated");
ClliNetwork.createClliLayer(dataBroker);
OpenRoadmNetwork.createOpenRoadmNetworkLayer(dataBroker);
- openRoadmTopology.createTopoLayer(dataBroker);
+ openRoadmFactory.createTopoLayerVersionControl(networkTransactionService);
dataTreeChangeListenerRegistration =
- dataBroker.registerDataTreeChangeListener(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL,
- InstanceIdentifiers.NETCONF_TOPOLOGY_II.child(Node.class)), topologyListener);
+ dataBroker.registerDataTreeChangeListener(DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL,
+ InstanceIdentifiers.NETCONF_TOPOLOGY_II.child(Node.class)), topologyListener);
networkutilsServiceRpcRegistration =
- rpcProviderRegistry.addRpcImplementation(TransportpceNetworkutilsService.class, networkutilsService);
+ rpcProviderService.registerRpcImplementation(TransportpceNetworkutilsService.class, networkutilsService);
}
- /**
- * Method called when the blueprint container is destroyed.
- */
+
+ /**
+ * Method called when the blueprint container is destroyed.
+ */
public void close() {
LOG.info("NetworkModelProvider Closed");
if (dataTreeChangeListenerRegistration != null) {