Fix transaction manager closing.

[openflowplugin.git] / applications / topology-manager / src / main / java / org / opendaylight / openflowplugin / applications / topology / manager / FlowCapableTopologyExporter.java

diff --git a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporter.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporter.java
index cb7d973c18793978f57edd1c9f23b3bc7a45396a..ce0f872fd1150d988c542a3a07007ecff628b806 100644 (file)
--- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporter.java
+++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporter.java
@@ -7,33 +7,20 @@
  */
 package org.opendaylight.openflowplugin.applications.topology.manager;
 
-import static org.opendaylight.openflowplugin.applications.topology.manager.FlowCapableNodeMapping.getNodeConnectorKey;
-import static org.opendaylight.openflowplugin.applications.topology.manager.FlowCapableNodeMapping.getNodeKey;
-import static org.opendaylight.openflowplugin.applications.topology.manager.FlowCapableNodeMapping.toTerminationPointId;
 import static org.opendaylight.openflowplugin.applications.topology.manager.FlowCapableNodeMapping.toTopologyLink;
-import static org.opendaylight.openflowplugin.applications.topology.manager.FlowCapableNodeMapping.toTopologyNodeId;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.opendaylight.openflowplugin.common.txchain.TransactionChainManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.FlowTopologyDiscoveryListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkDiscovered;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkOverutilized;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkRemoved;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkUtilizationNormal;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Link;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +28,7 @@ import org.slf4j.LoggerFactory;
 class FlowCapableTopologyExporter implements FlowTopologyDiscoveryListener {
 
     private static final Logger LOG = LoggerFactory.getLogger(FlowCapableTopologyExporter.class);
-    protected final InstanceIdentifier<Topology> iiToTopology;
+    private final InstanceIdentifier<Topology> iiToTopology;
     private final OperationProcessor processor;
 
     FlowCapableTopologyExporter(final OperationProcessor processor,
@@ -54,10 +41,10 @@ class FlowCapableTopologyExporter implements FlowTopologyDiscoveryListener {
     public void onLinkDiscovered(final LinkDiscovered notification) {
         processor.enqueueOperation(new TopologyOperation() {
             @Override
-            public void applyOperation(final ReadWriteTransaction transaction) {
+            public void applyOperation(final TransactionChainManager manager) {
                 final Link link = toTopologyLink(notification);
                 final InstanceIdentifier<Link> path = TopologyManagerUtil.linkPath(link, iiToTopology);
-                transaction.merge(LogicalDatastoreType.OPERATIONAL, path, link, true);
+                manager.mergeToTransaction(LogicalDatastoreType.OPERATIONAL, path, link, true);
             }
 
             @Override
@@ -76,18 +63,19 @@ class FlowCapableTopologyExporter implements FlowTopologyDiscoveryListener {
     public void onLinkRemoved(final LinkRemoved notification) {
         processor.enqueueOperation(new TopologyOperation() {
             @Override
-            public void applyOperation(final ReadWriteTransaction transaction) {
+            public void applyOperation(final TransactionChainManager manager) {
                 Optional<Link> linkOptional = Optional.absent();
                 try {
                     // read that checks if link exists (if we do not do this we might get an exception on delete)
-                    linkOptional = transaction.read(LogicalDatastoreType.OPERATIONAL,
+                    linkOptional = manager.readFromTransaction(LogicalDatastoreType.OPERATIONAL,
                             TopologyManagerUtil.linkPath(toTopologyLink(notification), iiToTopology)).checkedGet();
                 } catch (ReadFailedException e) {
-                    LOG.warn("Error occured when trying to read Link: {}", e.getMessage());
-                    LOG.debug("Error occured when trying to read Link.. ", e);
+                    LOG.warn("Error occurred when trying to read Link: {}", e.getMessage());
+                    LOG.debug("Error occurred when trying to read Link.. ", e);
                 }
                 if (linkOptional.isPresent()) {
-                    transaction.delete(LogicalDatastoreType.OPERATIONAL, TopologyManagerUtil.linkPath(toTopologyLink(notification), iiToTopology));
+                    manager.addDeleteOperationTotTxChain(LogicalDatastoreType.OPERATIONAL,
+                            TopologyManagerUtil.linkPath(toTopologyLink(notification), iiToTopology));
                 }
             }
 
@@ -103,26 +91,4 @@ class FlowCapableTopologyExporter implements FlowTopologyDiscoveryListener {
         // NOOP
     }
 
-    private InstanceIdentifier<Node> toNodeIdentifier(final NodeRef ref) {
-        org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey invNodeKey = getNodeKey(ref);
-        NodeKey nodeKey = new NodeKey(toTopologyNodeId(invNodeKey.getId()));
-        return iiToTopology.child(Node.class, nodeKey);
-    }
-
-    private InstanceIdentifier<TerminationPoint> toTerminationPointIdentifier(final NodeConnectorRef ref) {
-        org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey invNodeKey = getNodeKey(ref);
-        NodeConnectorKey invNodeConnectorKey = getNodeConnectorKey(ref);
-        return tpPath(toTopologyNodeId(invNodeKey.getId()), toTerminationPointId(invNodeConnectorKey.getId()));
-    }
-
-    private InstanceIdentifier<Node> getNodePath(final NodeId nodeId) {
-        return iiToTopology.child(Node.class, new NodeKey(nodeId));
-    }
-
-    private InstanceIdentifier<TerminationPoint> tpPath(final NodeId nodeId, final TpId tpId) {
-        NodeKey nodeKey = new NodeKey(nodeId);
-        TerminationPointKey tpKey = new TerminationPointKey(tpId);
-        return iiToTopology.child(Node.class, nodeKey).child(TerminationPoint.class, tpKey);
-    }
-
 }