* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
+
package org.opendaylight.unimgr.mef.nrp.impl.topologytervice;
import com.google.common.base.Optional;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.common.rev171113.Uuid;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.*;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.get.link.details.output.LinkBuilder;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.get.node.details.output.NodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.get.topology.details.output.TopologyBuilder;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.topology.Link;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.topology.LinkKey;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.topology.Node;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.NodeAdiAugmentation;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.NodeSvmAugmentation;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.Uuid;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.OwnedNodeEdgePoint1;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.Context1;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetLinkDetailsInput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetLinkDetailsOutput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetLinkDetailsOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetNodeDetailsInput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetNodeDetailsOutput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetNodeDetailsOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetNodeEdgePointDetailsInput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetNodeEdgePointDetailsOutput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyDetailsInput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyDetailsOutput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyDetailsOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyListInput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyListOutput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.TapiTopologyService;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.Topology;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.get.link.details.output.LinkBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.get.node.details.output.NodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.get.topology.details.output.TopologyBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.node.OwnedNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.node.OwnedNodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.Link;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.LinkKey;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.Node;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.*;
-import java.util.stream.Collectors;
-
/**
+ * Tapi topology RPC service implementation.
+ *
* @author bartosz.michalik@amartus.com
*/
public class TapiTopologyServiceImpl implements TapiTopologyService, AutoCloseable {
private static final Logger LOG = LoggerFactory.getLogger(TapiTopologyServiceImpl.class);
private DataBroker broker;
-
// TODO decide on strategy for executor service
- private ExecutorService executor = null;
+ private ListeningExecutorService executor = null;
public void init() {
Objects.requireNonNull(broker);
- if(executor == null) {
- executor = new ThreadPoolExecutor(4, 16,
- 30, TimeUnit.MINUTES,
- new LinkedBlockingQueue<>());
+ if (executor == null) {
+ executor = MoreExecutors.listeningDecorator(
+ new ThreadPoolExecutor(4, 16,
+ 30, TimeUnit.MINUTES,
+ new LinkedBlockingQueue<>()));
}
LOG.info("TapiTopologyService initialized");
}
@Override
- public void close() throws Exception {
- if(!executor.isTerminated()) {
+ public void close() {
+ if (!executor.isTerminated()) {
executor.shutdownNow();
}
}
- public void setExecutor(ExecutorService executor) {
- if(executor != null) throw new IllegalStateException();
- this.executor = executor;
- }
-
@Override
- public Future<RpcResult<GetNodeDetailsOutput>> getNodeDetails(GetNodeDetailsInput input) {
+ public ListenableFuture<RpcResult<GetNodeDetailsOutput>> getNodeDetails(GetNodeDetailsInput input) {
return executor.submit(() -> {
- NrpDao nrpDao = new NrpDao(broker.newReadOnlyTransaction());
+ NrpDao nrpDao = new NrpDao(broker.newReadOnlyTransaction());
Node node = nrpDao.getNode(input.getTopologyIdOrName(), input.getNodeIdOrName());
- if(node == null) return RpcResultBuilder.<GetNodeDetailsOutput>failed().withError(RpcError.ErrorType.APPLICATION,
- String.format("No node for id: %s in topology %s", input.getNodeIdOrName(), input.getTopologyIdOrName())).build();
-
- GetNodeDetailsOutput output = new GetNodeDetailsOutputBuilder().setNode(new NodeBuilder(node).build()).build();
+ if (node == null) {
+ return RpcResultBuilder.<GetNodeDetailsOutput>failed().withError(RpcError.ErrorType.APPLICATION,
+ String.format("No node for id: %s in topology %s",
+ input.getNodeIdOrName(), input.getTopologyIdOrName())).build();
+ }
+ node = rewriteNode(node);
+ GetNodeDetailsOutput output = new GetNodeDetailsOutputBuilder()
+ .setNode(new NodeBuilder(node).build()).build();
return RpcResultBuilder.success(output).build();
});
}
@Override
- public Future<RpcResult<GetNodeEdgePointDetailsOutput>> getNodeEdgePointDetails(GetNodeEdgePointDetailsInput input) {
- return null; //TODO not implemented
+ public ListenableFuture<RpcResult<GetNodeEdgePointDetailsOutput>> getNodeEdgePointDetails(
+ GetNodeEdgePointDetailsInput input) {
+ return null; //TODO not implements
}
@Override
- public Future<RpcResult<GetLinkDetailsOutput>> getLinkDetails(GetLinkDetailsInput input) {
+ public ListenableFuture<RpcResult<GetLinkDetailsOutput>> getLinkDetails(GetLinkDetailsInput input) {
return executor.submit(() -> {
- RpcResult<GetLinkDetailsOutput> out = RpcResultBuilder.<GetLinkDetailsOutput>failed().withError(RpcError.ErrorType.APPLICATION, "No link in topology").build();
+ RpcResult<GetLinkDetailsOutput> out = RpcResultBuilder.<GetLinkDetailsOutput>failed()
+ .withError(RpcError.ErrorType.APPLICATION, "No link in topology").build();
try {
ReadOnlyTransaction rtx = broker.newReadOnlyTransaction();
- KeyedInstanceIdentifier<Link, LinkKey> linkId = NrpDao.topo(input.getTopologyIdOrName()).child(Link.class, new LinkKey(new Uuid(input.getLinkIdOrName())));
+ KeyedInstanceIdentifier<Link, LinkKey> linkId = NrpDao.topo(input.getTopologyIdOrName())
+ .child(Link.class, new LinkKey(new Uuid(input.getLinkIdOrName())));
Optional<Link> optional = rtx.read(LogicalDatastoreType.OPERATIONAL, linkId).checkedGet();
- if(optional.isPresent()) {
+ if (optional.isPresent()) {
out = RpcResultBuilder
.success(new GetLinkDetailsOutputBuilder()
.setLink(new LinkBuilder(optional.get()).build()).build())
.build();
}
- } catch(ReadFailedException e) {
- out = RpcResultBuilder.<GetLinkDetailsOutput>failed().withError(RpcError.ErrorType.APPLICATION, String.format("Cannot read link %s",input.getLinkIdOrName()) ,e).build();
+ } catch (ReadFailedException e) {
+ out = RpcResultBuilder.<GetLinkDetailsOutput>failed()
+ .withError(RpcError.ErrorType.APPLICATION,
+ String.format("Cannot read link %s", input.getLinkIdOrName()), e).build();
}
return out;
});
}
+ @Override
+ public ListenableFuture<RpcResult<GetTopologyListOutput>> getTopologyList(GetTopologyListInput input) {
+ return executor.submit(this::getTopologies);
+ }
+
+ @Override
+ public ListenableFuture<RpcResult<GetTopologyDetailsOutput>> getTopologyDetails(GetTopologyDetailsInput input) {
+ return executor.submit(() -> {
+ NrpDao nrpDao = new NrpDao(broker.newReadOnlyTransaction());
+ Topology topo = nrpDao.getTopology(input.getTopologyIdOrName());
+
+ if (topo == null) {
+ return RpcResultBuilder.<GetTopologyDetailsOutput>failed()
+ .withError(RpcError.ErrorType.APPLICATION,
+ String.format("No topology for id: %s", input.getTopologyIdOrName())).build();
+ }
+
+ GetTopologyDetailsOutput result = new GetTopologyDetailsOutputBuilder()
+ .setTopology(new TopologyBuilder(rewriteTopology(topo)).build())
+ .build();
+ return RpcResultBuilder.success(result).build();
+ });
+ }
+
private RpcResult<GetTopologyListOutput> getTopologies() {
ReadOnlyTransaction rtx = broker.newReadOnlyTransaction();
- RpcResult<GetTopologyListOutput> out = RpcResultBuilder.success(new GetTopologyListOutputBuilder().build()).build();
+ RpcResult<GetTopologyListOutput> out = RpcResultBuilder
+ .success(new GetTopologyListOutputBuilder().build()).build();
try {
List<? extends Topology> topologies;
Optional<Context1> ctx = rtx.read(LogicalDatastoreType.OPERATIONAL, NrpDao.ctx()
.augmentation(Context1.class)).checkedGet();
- if(ctx.isPresent()) {
+ if (ctx.isPresent()) {
topologies = ctx.get().getTopology();
out = RpcResultBuilder.success(
new GetTopologyListOutputBuilder()
- .setTopology(topologies.stream().map(t -> new org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.get.topology.list.output.TopologyBuilder(t).build()).collect(Collectors.toList()))
+ .setTopology(topologies.stream().map(t ->
+ new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307
+ .get.topology.list.output.TopologyBuilder(rewriteTopology(t))
+ .build()
+ ).collect(Collectors.toList()))
).build();
}
- } catch (ReadFailedException e) {
- out = RpcResultBuilder.<GetTopologyListOutput>failed().withError(RpcError.ErrorType.APPLICATION, "Cannot read topologies" ,e).build();
+ } catch (ReadFailedException | NullPointerException e) {
+ out = RpcResultBuilder.<GetTopologyListOutput>failed()
+ .withError(RpcError.ErrorType.APPLICATION, "Cannot read topologies", e).build();
}
return out;
}
- @Override
- public Future<RpcResult<GetTopologyListOutput>> getTopologyList() {
- return executor.submit(this::getTopologies);
- }
+ private Node rewriteNode(Node node) {
+ assert node != null;
+ if (node.getOwnedNodeEdgePoint() == null) {
+ return node;
+ }
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.NodeBuilder builder
+ = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.NodeBuilder(node);
- @Override
- public Future<RpcResult<GetTopologyDetailsOutput>> getTopologyDetails(GetTopologyDetailsInput input) {
- return executor.submit(() -> {
- NrpDao nrpDao = new NrpDao(broker.newReadOnlyTransaction());
- org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.topology.context.Topology topo = nrpDao.getTopology(input.getTopologyIdOrName());
+ List<OwnedNodeEdgePoint> neps = node.getOwnedNodeEdgePoint().stream()
+ .map(ep -> new OwnedNodeEdgePointBuilder(ep).removeAugmentation(OwnedNodeEdgePoint1.class).build())
+ .collect(Collectors.toList());
- if(topo == null) return RpcResultBuilder.<GetTopologyDetailsOutput>failed().withError(RpcError.ErrorType.APPLICATION, String.format("No topology for id: %s", input.getTopologyIdOrName())).build();
+ builder
+ .setOwnedNodeEdgePoint(neps)
+ .removeAugmentation(NodeAdiAugmentation.class)
+ .removeAugmentation(NodeSvmAugmentation.class);
- GetTopologyDetailsOutput result = new GetTopologyDetailsOutputBuilder()
- .setTopology(new TopologyBuilder(topo).build())
- .build();
- return RpcResultBuilder.success(result).build();
- });
+ return builder.build();
+ }
+
+ private Topology rewriteTopology(Topology topo) {
+ assert topo != null;
+ if (topo.getNode() == null) {
+ return topo;
+ }
+ return new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307
+ .topology.context.TopologyBuilder(topo)
+ .setNode(topo.getNode().stream().map(this::rewriteNode).collect(Collectors.toList()))
+ .build();
}
public void setBroker(DataBroker broker) {
this.broker = broker;
}
+
}
Code Review / unimgr.git / blobdiff