Topology manager - removing links with after removing termination point.

[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 459ac47789e221b260bb01e4e8de768be9761bc0..f7ff99f79225d9f955a4b660077b1f8bce4ddf48 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
@@ -13,20 +13,13 @@ 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.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorUpdated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeUpdated;
 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.NodeConnectorRemoved;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorUpdated;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRemoved;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeUpdated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.OpendaylightInventoryListener;
 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;
@@ -42,13 +35,11 @@ import org.slf4j.LoggerFactory;
 
 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.toTerminationPoint;
 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.toTopologyNode;
 import static org.opendaylight.openflowplugin.applications.topology.manager.FlowCapableNodeMapping.toTopologyNodeId;
 
-class FlowCapableTopologyExporter implements FlowTopologyDiscoveryListener, OpendaylightInventoryListener {
+class FlowCapableTopologyExporter implements FlowTopologyDiscoveryListener {
 
     private static final Logger LOG = LoggerFactory.getLogger(FlowCapableTopologyExporter.class);
     protected final InstanceIdentifier<Topology> iiToTopology;
@@ -60,106 +51,6 @@ class FlowCapableTopologyExporter implements FlowTopologyDiscoveryListener, Open
         this.iiToTopology = Preconditions.checkNotNull(topology);
     }
 
-    @Override
-    public void onNodeRemoved(final NodeRemoved notification) {
-
-        final NodeId nodeId = toTopologyNodeId(getNodeKey(notification.getNodeRef()).getId());
-        final InstanceIdentifier<Node> nodeInstance = toNodeIdentifier(notification.getNodeRef());
-
-        processor.enqueueOperation(new TopologyOperation() {
-            @Override
-            public void applyOperation(ReadWriteTransaction transaction) {
-                    TopologyManagerUtil.removeAffectedLinks(nodeId, transaction, iiToTopology);
-                    transaction.delete(LogicalDatastoreType.OPERATIONAL, nodeInstance);
-            }
-
-            @Override
-            public String toString() {
-                return "onNodeRemoved";
-            }
-        });
-    }
-
-    @Override
-    public void onNodeUpdated(final NodeUpdated notification) {
-        FlowCapableNodeUpdated fcnu = notification.getAugmentation(FlowCapableNodeUpdated.class);
-        if (fcnu != null) {
-            processor.enqueueOperation(new TopologyOperation() {
-                @Override
-                public void applyOperation(final ReadWriteTransaction transaction) {
-                    final Node node = toTopologyNode(toTopologyNodeId(notification.getId()), notification.getNodeRef());
-                    final InstanceIdentifier<Node> path = getNodePath(toTopologyNodeId(notification.getId()));
-                    transaction.merge(LogicalDatastoreType.OPERATIONAL, path, node, true);
-                }
-
-                @Override
-                public String toString() {
-                    return "onNodeUpdated";
-                }
-            });
-        }
-    }
-
-    @Override
-    public void onNodeConnectorRemoved(final NodeConnectorRemoved notification) {
-
-        final InstanceIdentifier<TerminationPoint> tpInstance = toTerminationPointIdentifier(
-                notification.getNodeConnectorRef());
-
-        final InstanceIdentifier<Node> node = tpInstance.firstIdentifierOf(Node.class);
-
-        final TpId tpId = toTerminationPointId(getNodeConnectorKey(
-                notification.getNodeConnectorRef()).getId());
-
-        processor.enqueueOperation(new TopologyOperation() {
-            @Override
-            public void applyOperation(ReadWriteTransaction transaction) {
-                Optional<Node> nodeOptional = Optional.absent();
-                try {
-                    nodeOptional = transaction.read(LogicalDatastoreType.OPERATIONAL, node).checkedGet();
-                } catch (ReadFailedException e) {
-                    LOG.error("Error occured when trying to read NodeConnector ", e);
-                }
-                if (nodeOptional.isPresent()) {
-                    TopologyManagerUtil.removeAffectedLinks(tpId, transaction, iiToTopology);
-                    transaction.delete(LogicalDatastoreType.OPERATIONAL, tpInstance);
-                }
-            }
-
-            @Override
-            public String toString() {
-                return "onNodeConnectorRemoved";
-            }
-        });
-    }
-
-    @Override
-    public void onNodeConnectorUpdated(final NodeConnectorUpdated notification) {
-        final FlowCapableNodeConnectorUpdated fcncu = notification.getAugmentation(
-                FlowCapableNodeConnectorUpdated.class);
-        if (fcncu != null) {
-            processor.enqueueOperation(new TopologyOperation() {
-                @Override
-                public void applyOperation(final ReadWriteTransaction transaction) {
-                    final NodeId nodeId = toTopologyNodeId(getNodeKey(notification.getNodeConnectorRef()).getId());
-                    TerminationPoint point = toTerminationPoint(toTerminationPointId(notification.getId()),
-                            notification.getNodeConnectorRef());
-                    final InstanceIdentifier<TerminationPoint> path = tpPath(nodeId, point.getKey().getTpId());
-                    transaction.merge(LogicalDatastoreType.OPERATIONAL, path, point, true);
-                    if ((fcncu.getState() != null && fcncu.getState().isLinkDown())
-                            || (fcncu.getConfiguration() != null && fcncu.getConfiguration().isPORTDOWN())) {
-                        TopologyManagerUtil.removeAffectedLinks(point.getTpId(), transaction, iiToTopology);
-                    }
-                }
-
-                @Override
-                public String toString() {
-                    return "onNodeConnectorUpdated";
-                }
-            });
-        }
-    }
-
     @Override
     public void onLinkDiscovered(final LinkDiscovered notification) {
         processor.enqueueOperation(new TopologyOperation() {