package org.opendaylight.netconf.sal.connect.netconf.sal;
-import com.google.common.base.Function;
import com.google.common.base.Preconditions;
-import com.google.common.collect.FluentIterable;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.ClusteredConnectionStatusBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.UnavailableCapabilities;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.UnavailableCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.unavailable.capabilities.UnavailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.unavailable.capabilities.UnavailableCapability.FailureReason;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.unavailable.capabilities.UnavailableCapabilityBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-final class NetconfDeviceTopologyAdapter implements AutoCloseable {
+public final class NetconfDeviceTopologyAdapter implements AutoCloseable {
private static final Logger LOG = LoggerFactory.getLogger(NetconfDeviceTopologyAdapter.class);
- public static final Function<Entry<QName, FailureReason>, UnavailableCapability> UNAVAILABLE_CAPABILITY_TRANSFORMER = new Function<Entry<QName, FailureReason>, UnavailableCapability>() {
- @Override
- public UnavailableCapability apply(final Entry<QName, FailureReason> input) {
- return new UnavailableCapabilityBuilder()
- .setCapability(input.getKey().toString())
- .setFailureReason(input.getValue()).build();
- }
- };
- public static final Function<QName, String> AVAILABLE_CAPABILITY_TRANSFORMER = new Function<QName, String>() {
- @Override
- public String apply(QName qName) {
- // intern string representation of a capability to avoid duplicates
- return qName.toString().intern();
- }
- };
private final RemoteDeviceId id;
private BindingTransactionChain txChain;
this.txChain = Preconditions.checkNotNull(txChain);
this.networkTopologyPath = InstanceIdentifier.builder(NetworkTopology.class).build();
- this.topologyListPath = networkTopologyPath.child(Topology.class, new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName())));
+ this.topologyListPath = networkTopologyPath
+ .child(Topology.class, new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName())));
initDeviceData();
}
createNetworkTopologyIfNotPresent(writeTx);
final InstanceIdentifier<Node> path = id.getTopologyBindingPath();
- NodeBuilder nodeBuilder = getNodeIdBuilder(id);
+ final NodeBuilder nodeBuilder = getNodeIdBuilder(id);
NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder();
netconfNodeBuilder.setConnectionStatus(ConnectionStatus.Connecting);
netconfNodeBuilder.setHost(id.getHost());
nodeBuilder.addAugmentation(NetconfNode.class, netconfNodeBuilder.build());
Node node = nodeBuilder.build();
- LOG.trace(
- "{}: Init device state transaction {} putting if absent operational data started.",
+ LOG.trace("{}: Init device state transaction {} putting if absent operational data started.",
id, writeTx.getIdentifier());
writeTx.put(LogicalDatastoreType.OPERATIONAL, path, node);
- LOG.trace(
- "{}: Init device state transaction {} putting operational data ended.",
+ LOG.trace("{}: Init device state transaction {} putting operational data ended.", id, writeTx.getIdentifier());
+ LOG.trace("{}: Init device state transaction {} putting if absent config data started.",
id, writeTx.getIdentifier());
+ LOG.trace("{}: Init device state transaction {} putting config data ended.", id, writeTx.getIdentifier());
- LOG.trace(
- "{}: Init device state transaction {} putting if absent config data started.",
+ commitTransaction(writeTx, "init");
+ }
+
+ public void updateDeviceData(final boolean up, final NetconfDeviceCapabilities capabilities) {
+ final NetconfNode data = buildDataForNetconfNode(up, capabilities);
+
+ final WriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+ LOG.trace("{}: Update device state transaction {} merging operational data started.",
id, writeTx.getIdentifier());
- LOG.trace(
- "{}: Init device state transaction {} putting config data ended.",
+ writeTx.put(LogicalDatastoreType.OPERATIONAL, id.getTopologyBindingPath().augmentation(NetconfNode.class),
+ data, true);
+ LOG.trace("{}: Update device state transaction {} merging operational data ended.",
id, writeTx.getIdentifier());
- commitTransaction(writeTx, "init");
+ commitTransaction(writeTx, "update");
}
- public void updateDeviceData(boolean up, NetconfDeviceCapabilities capabilities) {
- final NetconfNode data = buildDataForNetconfNode(up, capabilities);
+ public void updateClusteredDeviceData(final boolean up, final String masterAddress,
+ final NetconfDeviceCapabilities capabilities) {
+ final NetconfNode data = buildDataForNetconfClusteredNode(up, masterAddress, capabilities);
final WriteTransaction writeTx = txChain.newWriteOnlyTransaction();
- LOG.trace(
- "{}: Update device state transaction {} merging operational data started.",
+ LOG.trace("{}: Update device state transaction {} merging operational data started.",
id, writeTx.getIdentifier());
- writeTx.put(LogicalDatastoreType.OPERATIONAL, id.getTopologyBindingPath().augmentation(NetconfNode.class), data, true);
- LOG.trace(
- "{}: Update device state transaction {} merging operational data ended.",
+ writeTx.put(LogicalDatastoreType.OPERATIONAL,
+ id.getTopologyBindingPath().augmentation(NetconfNode.class), data, true);
+ LOG.trace("{}: Update device state transaction {} merging operational data ended.",
id, writeTx.getIdentifier());
commitTransaction(writeTx, "update");
}
- public void setDeviceAsFailed(Throwable throwable) {
- String reason = (throwable != null && throwable.getMessage() != null) ? throwable.getMessage() : UNKNOWN_REASON;
+ public void setDeviceAsFailed(final Throwable throwable) {
+ String reason = throwable != null && throwable.getMessage() != null ? throwable.getMessage() : UNKNOWN_REASON;
- final NetconfNode data = new NetconfNodeBuilder().setConnectionStatus(ConnectionStatus.UnableToConnect).setConnectedMessage(reason).build();
+ final NetconfNode data = new NetconfNodeBuilder()
+ .setConnectionStatus(ConnectionStatus.UnableToConnect).setConnectedMessage(reason).build();
final WriteTransaction writeTx = txChain.newWriteOnlyTransaction();
LOG.trace(
"{}: Setting device state as failed {} putting operational data started.",
id, writeTx.getIdentifier());
- writeTx.put(LogicalDatastoreType.OPERATIONAL, id.getTopologyBindingPath().augmentation(NetconfNode.class), data, true);
+ writeTx.put(LogicalDatastoreType.OPERATIONAL,
+ id.getTopologyBindingPath().augmentation(NetconfNode.class), data, true);
LOG.trace(
"{}: Setting device state as failed {} putting operational data ended.",
id, writeTx.getIdentifier());
commitTransaction(writeTx, "update-failed-device");
}
- private NetconfNode buildDataForNetconfNode(boolean up, NetconfDeviceCapabilities capabilities) {
- List<String> capabilityList = new ArrayList<>();
+ private NetconfNode buildDataForNetconfNode(final boolean up, final NetconfDeviceCapabilities capabilities) {
+ List<AvailableCapability> capabilityList = new ArrayList<>();
capabilityList.addAll(capabilities.getNonModuleBasedCapabilities());
- capabilityList.addAll(FluentIterable.from(capabilities.getResolvedCapabilities()).transform(AVAILABLE_CAPABILITY_TRANSFORMER).toList());
+ capabilityList.addAll(capabilities.getResolvedCapabilities());
+
final AvailableCapabilitiesBuilder avCapabalitiesBuilder = new AvailableCapabilitiesBuilder();
avCapabalitiesBuilder.setAvailableCapability(capabilityList);
- final UnavailableCapabilities unavailableCapabilities =
- new UnavailableCapabilitiesBuilder().setUnavailableCapability(FluentIterable.from(capabilities.getUnresolvedCapabilites().entrySet())
- .transform(UNAVAILABLE_CAPABILITY_TRANSFORMER).toList()).build();
+ final NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder()
+ .setHost(id.getHost())
+ .setPort(new PortNumber(id.getAddress().getPort()))
+ .setConnectionStatus(up ? ConnectionStatus.Connected : ConnectionStatus.Connecting)
+ .setAvailableCapabilities(avCapabalitiesBuilder.build())
+ .setUnavailableCapabilities(unavailableCapabilities(capabilities.getUnresolvedCapabilites()));
+
+ return netconfNodeBuilder.build();
+ }
+
+ private NetconfNode buildDataForNetconfClusteredNode(final boolean up, final String masterNodeAddress,
+ final NetconfDeviceCapabilities capabilities) {
+ List<AvailableCapability> capabilityList = new ArrayList<>();
+ capabilityList.addAll(capabilities.getNonModuleBasedCapabilities());
+ capabilityList.addAll(capabilities.getResolvedCapabilities());
+ final AvailableCapabilitiesBuilder avCapabalitiesBuilder = new AvailableCapabilitiesBuilder();
+ avCapabalitiesBuilder.setAvailableCapability(capabilityList);
final NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder()
.setHost(id.getHost())
.setPort(new PortNumber(id.getAddress().getPort()))
.setConnectionStatus(up ? ConnectionStatus.Connected : ConnectionStatus.Connecting)
.setAvailableCapabilities(avCapabalitiesBuilder.build())
- .setUnavailableCapabilities(unavailableCapabilities);
+ .setUnavailableCapabilities(unavailableCapabilities(capabilities.getUnresolvedCapabilites()))
+ .setClusteredConnectionStatus(
+ new ClusteredConnectionStatusBuilder().setNetconfMasterNode(masterNodeAddress).build());
return netconfNodeBuilder.build();
}
+ private static UnavailableCapabilities unavailableCapabilities(final Map<QName, FailureReason> input) {
+ return new UnavailableCapabilitiesBuilder().setUnavailableCapability(input.entrySet().stream().map(
+ e -> new UnavailableCapabilityBuilder().setCapability(e.getKey().toString()).setFailureReason(
+ e.getValue()).build()).collect(Collectors.toList())).build();
+ }
+
public void removeDeviceConfiguration() {
final WriteTransaction writeTx = txChain.newWriteOnlyTransaction();
final NetworkTopology networkTopology = new NetworkTopologyBuilder().build();
LOG.trace("{}: Merging {} container to ensure its presence", id,
- networkTopology.QNAME, writeTx.getIdentifier());
+ NetworkTopology.QNAME, writeTx.getIdentifier());
writeTx.merge(LogicalDatastoreType.OPERATIONAL, networkTopologyPath, networkTopology);
- final Topology topology = new TopologyBuilder().setTopologyId(new TopologyId(TopologyNetconf.QNAME.getLocalName())).build();
+ final Topology topology =
+ new TopologyBuilder().setTopologyId(new TopologyId(TopologyNetconf.QNAME.getLocalName())).build();
LOG.trace("{}: Merging {} container to ensure its presence", id,
- topology.QNAME, writeTx.getIdentifier());
+ Topology.QNAME, writeTx.getIdentifier());
writeTx.merge(LogicalDatastoreType.OPERATIONAL, topologyListPath, topology);
}
}
@Override
- public void onFailure(final Throwable t) {
+ public void onFailure(final Throwable throwable) {
LOG.error("{}: Transaction({}) {} FAILED!", id, txType,
- transaction.getIdentifier(), t);
- throw new IllegalStateException(id + " Transaction(" + txType + ") not committed correctly", t);
+ transaction.getIdentifier(), throwable);
+ throw new IllegalStateException(
+ id + " Transaction(" + txType + ") not committed correctly", throwable);
}
- });
-
+ }, MoreExecutors.directExecutor());
}
private static Node getNodeWithId(final RemoteDeviceId id) {
removeDeviceConfiguration();
}
- public void setTxChain(BindingTransactionChain txChain) {
+ public void setTxChain(final BindingTransactionChain txChain) {
this.txChain = Preconditions.checkNotNull(txChain);
}
}
Code Review / netconf.git / blobdiff