-/**
+/*
* Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
*/
package org.opendaylight.openflowplugin.applications.topology.manager;
-import com.google.common.base.Optional;
import java.util.Collection;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
-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 javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import org.apache.aries.blueprint.annotation.service.Reference;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Singleton
public class TerminationPointChangeListenerImpl extends DataTreeChangeListenerImpl<FlowCapableNodeConnector> {
private static final Logger LOG = LoggerFactory.getLogger(TerminationPointChangeListenerImpl.class);
- public TerminationPointChangeListenerImpl(final DataBroker dataBroker, final OperationProcessor operationProcessor) {
- super(operationProcessor, dataBroker, InstanceIdentifier.builder(Nodes.class).child(Node.class)
- .child(NodeConnector.class).augmentation(FlowCapableNodeConnector.class).build());
+ @Inject
+ public TerminationPointChangeListenerImpl(@Reference final DataBroker dataBroker,
+ final OperationProcessor operationProcessor) {
+ super(operationProcessor, dataBroker,
+ InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class)
+ .augmentation(FlowCapableNodeConnector.class).build());
this.operationProcessor = operationProcessor;
}
processRemovedTerminationPoints(modification);
break;
default:
- throw new IllegalArgumentException("Unhandled modification type: {}" +
- modification.getRootNode().getModificationType());
+ throw new IllegalArgumentException(
+ "Unhandled modification type: {}" + modification.getRootNode().getModificationType());
}
}
}
+ @Override
+ @PreDestroy
+ public void close() throws Exception {
+ super.close();
+ }
+
private void processRemovedTerminationPoints(final DataTreeModification<FlowCapableNodeConnector> modification) {
final InstanceIdentifier<FlowCapableNodeConnector> removedNode = modification.getRootPath().getRootIdentifier();
final TpId terminationPointId = provideTopologyTerminationPointId(removedNode);
terminationPointId, removedNode);
if (iiToTopologyTerminationPoint != null) {
- final InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node> node = iiToTopologyTerminationPoint.firstIdentifierOf(org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node.class);
- operationProcessor.enqueueOperation(new TopologyOperation() {
- @Override
- public void applyOperation(final ReadWriteTransaction transaction) {
- Optional<org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node> nodeOptional = Optional.absent();
- try {
- nodeOptional = transaction.read(LogicalDatastoreType.OPERATIONAL, node).checkedGet();
- } catch (ReadFailedException e) {
- LOG.warn("Error occured when trying to read NodeConnector: {}", e.getMessage());
- LOG.debug("Error occured when trying to read NodeConnector.. ", e);
- }
- if (nodeOptional.isPresent()) {
- TopologyManagerUtil.removeAffectedLinks(terminationPointId, transaction, II_TO_TOPOLOGY);
- transaction.delete(LogicalDatastoreType.OPERATIONAL, iiToTopologyTerminationPoint);
- }
+ final InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology
+ .rev131021.network.topology.topology.Node>
+ node = iiToTopologyTerminationPoint.firstIdentifierOf(
+ org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network
+ .topology.topology.Node.class);
+ operationProcessor.enqueueOperation(manager -> {
+ Optional<org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network
+ .topology.topology.Node>
+ nodeOptional = Optional.empty();
+ try {
+ nodeOptional = manager.readFromTransaction(LogicalDatastoreType.OPERATIONAL, node).get();
+ } catch (InterruptedException | ExecutionException e) {
+ LOG.warn("Error occurred when trying to read NodeConnector: {}", e.getMessage());
+ LOG.debug("Error occurred when trying to read NodeConnector.. ", e);
+ }
+ if (nodeOptional.isPresent()) {
+ TopologyManagerUtil.removeAffectedLinks(terminationPointId, manager, II_TO_TOPOLOGY);
+ manager.addDeleteOperationToTxChain(LogicalDatastoreType.OPERATIONAL,
+ iiToTopologyTerminationPoint);
}
});
} else {
- LOG.debug("Instance identifier to inventory wasn't translated to topology while deleting termination point.");
+ LOG.debug(
+ "Instance identifier to inventory wasn't translated to topology while deleting termination point.");
}
}
}
private void processAddedTerminationPoints(final DataTreeModification<FlowCapableNodeConnector> modification) {
- final InstanceIdentifier<FlowCapableNodeConnector> iiToNodeInInventory = modification.getRootPath().getRootIdentifier();
+ final InstanceIdentifier<FlowCapableNodeConnector> iiToNodeInInventory = modification.getRootPath()
+ .getRootIdentifier();
TpId terminationPointIdInTopology = provideTopologyTerminationPointId(iiToNodeInInventory);
if (terminationPointIdInTopology != null) {
InstanceIdentifier<TerminationPoint> iiToTopologyTerminationPoint = provideIIToTopologyTerminationPoint(
}
private void removeLinks(final FlowCapableNodeConnector flowCapNodeConnector, final TerminationPoint point) {
- operationProcessor.enqueueOperation(new TopologyOperation() {
- @Override
- public void applyOperation(final ReadWriteTransaction transaction) {
- if ((flowCapNodeConnector.getState() != null && flowCapNodeConnector.getState().isLinkDown())
- || (flowCapNodeConnector.getConfiguration() != null && flowCapNodeConnector.getConfiguration().isPORTDOWN())) {
- TopologyManagerUtil.removeAffectedLinks(point.getTpId(), transaction, II_TO_TOPOLOGY);
- }
+ operationProcessor.enqueueOperation(manager -> {
+ if (flowCapNodeConnector.getState() != null && flowCapNodeConnector.getState().isLinkDown()
+ || flowCapNodeConnector.getConfiguration() != null
+ && flowCapNodeConnector.getConfiguration().isPORTDOWN()) {
+ TopologyManagerUtil.removeAffectedLinks(point.getTpId(), manager, II_TO_TOPOLOGY);
}
});
}
private static TerminationPoint prepareTopologyTerminationPoint(final TpId terminationPointIdInTopology,
- final InstanceIdentifier<FlowCapableNodeConnector> iiToNodeInInventory) {
+ final
+ InstanceIdentifier<FlowCapableNodeConnector>
+ iiToNodeInInventory) {
final InventoryNodeConnector inventoryNodeConnector = new InventoryNodeConnectorBuilder()
- .setInventoryNodeConnectorRef(new NodeConnectorRef(iiToNodeInInventory.firstIdentifierOf(NodeConnector.class))).build();
+ .setInventoryNodeConnectorRef(
+ new NodeConnectorRef(iiToNodeInInventory.firstIdentifierOf(NodeConnector.class))).build();
final TerminationPointBuilder terminationPointBuilder = new TerminationPointBuilder();
terminationPointBuilder.setTpId(terminationPointIdInTopology);
terminationPointBuilder.addAugmentation(InventoryNodeConnector.class, inventoryNodeConnector);
return terminationPointBuilder.build();
}
- private InstanceIdentifier<TerminationPoint> provideIIToTopologyTerminationPoint(final TpId terminationPointIdInTopology,
- final InstanceIdentifier<FlowCapableNodeConnector> iiToNodeInInventory) {
+ private InstanceIdentifier<TerminationPoint> provideIIToTopologyTerminationPoint(
+ final TpId terminationPointIdInTopology,
+ final InstanceIdentifier<FlowCapableNodeConnector> iiToNodeInInventory) {
NodeId nodeIdInTopology = provideTopologyNodeId(iiToNodeInInventory);
if (terminationPointIdInTopology != null && nodeIdInTopology != null) {
- InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node> iiToTopologyNode = provideIIToTopologyNode(nodeIdInTopology);
- return iiToTopologyNode.builder().child(TerminationPoint.class, new TerminationPointKey(terminationPointIdInTopology)).build();
+ InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology
+ .rev131021.network.topology.topology.Node>
+ iiToTopologyNode = provideIIToTopologyNode(nodeIdInTopology);
+ return iiToTopologyNode.builder()
+ .child(TerminationPoint.class, new TerminationPointKey(terminationPointIdInTopology)).build();
} else {
- LOG.debug("Value of termination point ID in topology is null. Instance identifier to topology can't be built");
+ LOG.debug(
+ "Value of termination point ID in topology is null. Instance identifier to topology can't be "
+ + "built");
return null;
}
}
- private static TpId provideTopologyTerminationPointId(final InstanceIdentifier<FlowCapableNodeConnector> iiToNodeInInventory) {
- NodeConnectorKey inventoryNodeConnectorKey = iiToNodeInInventory.firstKeyOf(NodeConnector.class,
- NodeConnectorKey.class);
+ private static TpId provideTopologyTerminationPointId(
+ final InstanceIdentifier<FlowCapableNodeConnector> iiToNodeInInventory) {
+ NodeConnectorKey inventoryNodeConnectorKey = iiToNodeInInventory.firstKeyOf(NodeConnector.class);
if (inventoryNodeConnectorKey != null) {
return new TpId(inventoryNodeConnectorKey.getId().getValue());
}
Code Review / openflowplugin.git / blobdiff