import com.google.common.util.concurrent.FluentFuture;
import com.google.common.util.concurrent.ListenableFuture;
+import java.nio.charset.Charset;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.transportpce.common.InstanceIdentifiers;
import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingKey;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1;
import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.Name;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameKey;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetailsInput;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetailsOutput;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeDetailsInput;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.get.topology.details.output.TopologyBuilder;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.OwnedNodeEdgePoint;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.OwnedNodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.OwnedNodeEdgePointKey;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.edge.point.MappedServiceInterfacePoint;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.edge.point.MappedServiceInterfacePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.edge.point.MappedServiceInterfacePointKey;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.LinkKey;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
public class TapiTopologyImpl implements TapiTopologyService {
private static final Logger LOG = LoggerFactory.getLogger(TapiTopologyImpl.class);
+ private static final String ETH_TOPO = "Ethernet Topology";
+ private static final String T0_MULTI_LAYER_TOPO = "T0 - Multi-layer topology";
private final DataBroker dataBroker;
public TapiTopologyImpl(DataBroker dataBroker) {
@Override
public ListenableFuture<RpcResult<GetTopologyDetailsOutput>> getTopologyDetails(GetTopologyDetailsInput input) {
- LOG.info("Building TAPI Topology absraction from {}", input.getTopologyIdOrName());
+ LOG.info("Building TAPI Topology abstraction from {}", input.getTopologyIdOrName());
Topology topology = null;
switch (input.getTopologyIdOrName()) {
case NetworkUtils.OVERLAY_NETWORK_ID:
private Topology createAbstractedOpenroadmTopology() {
// read openroadm-topology
@NonNull
- FluentFuture<Optional<Network>> openroadmTopoOpt = dataBroker.newReadOnlyTransaction().read(
- LogicalDatastoreType.CONFIGURATION, InstanceIdentifiers.OVERLAY_NETWORK_II);
- if (openroadmTopoOpt.isDone()) {
- Network openroadmTopo = null;
- try {
- openroadmTopo = openroadmTopoOpt.get().get();
- } catch (InterruptedException | ExecutionException | NoSuchElementException e) {
- LOG.error("Impossible to retreive openroadm-topology from mdsal");
- }
- List<Node> nodeList = openroadmTopo.getNode();
- @Nullable
- List<Link> linkList = openroadmTopo.augmentation(Network1.class).getLink();
- List<Link> xponderOutLinkList = linkList.stream().filter(lk -> lk.augmentation(Link1.class).getLinkType()
- .equals(OpenroadmLinkType.XPONDEROUTPUT)).collect(Collectors.toList());
- List<Link> xponderInLinkList = linkList.stream().filter(lk -> lk.augmentation(Link1.class).getLinkType()
- .equals(OpenroadmLinkType.XPONDERINPUT)).collect(Collectors.toList());
+ FluentFuture<Optional<Network>> openroadmTopoOpt = dataBroker.newReadOnlyTransaction()
+ .read(LogicalDatastoreType.CONFIGURATION, InstanceIdentifiers.OVERLAY_NETWORK_II);
+ if (!openroadmTopoOpt.isDone()) {
+ LOG.warn("Cannot get openroadm topology, returning null");
+ return null;
+ }
+ Optional<Network> optionalOpenroadmTop = null;
+ try {
+ optionalOpenroadmTop = openroadmTopoOpt.get();
+ } catch (InterruptedException e) {
+ //sonar : "InterruptedException" should not be ignored (java:S2142)
+ //https://www.ibm.com/developerworks/java/library/j-jtp05236/index.html?ca=drs-#2.1
+ Thread.currentThread().interrupt();
+ return null;
+ } catch (ExecutionException | NoSuchElementException e) {
+ LOG.error("Impossible to retrieve openroadm-topology from mdsal", e);
+ return null;
+ }
- List<Node> xpdrNodeList = nodeList.stream().filter(nt -> nt.augmentation(
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class).getNodeType()
- .equals(OpenroadmNodeType.XPONDER)).collect(Collectors.toList());
- Map<String, List<String>> clientPortMap = new HashMap<>();
- for (Node node : xpdrNodeList) {
- String nodeId = node.getSupportingNode().get(0).getNodeRef().getValue();
- List<String> clientPortList = new ArrayList<>();
- for (TerminationPoint tp : node.augmentation(Node1.class).getTerminationPoint()) {
- if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERCLIENT)) {
- if (checkTp(node.getNodeId().getValue(), nodeId, tp, xponderOutLinkList, xponderInLinkList)) {
- clientPortList.add(tp.getTpId().getValue());
- }
- }
- }
- if (!clientPortList.isEmpty()) {
- clientPortMap.put(nodeId, clientPortList);
- }
- }
+ if (!optionalOpenroadmTop.isPresent()) {
+ LOG.warn("Openroadm topology is not present, returning null");
+ return null;
+ }
+ Network openroadmTopo = optionalOpenroadmTop.get();
+ List<Node> nodeList = new ArrayList<>(openroadmTopo.getNode().values());
+ List<Link> linkList = null;
+ if (openroadmTopo.augmentation(Network1.class) != null) {
+ linkList = new ArrayList<>(openroadmTopo.augmentation(Network1.class).getLink().values());
+ } else {
+ linkList = new ArrayList<>();
+ }
+ List<Link> xponderOutLinkList = linkList.stream()
+ .filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.XPONDEROUTPUT))
+ .collect(Collectors.toList());
+ List<Link> xponderInLinkList = linkList.stream()
+ .filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.XPONDERINPUT))
+ .collect(Collectors.toList());
- List<String> goodTpList = new ArrayList<>();
- for (Map.Entry<String, List<String>> entry : clientPortMap.entrySet()) {
- String key = entry.getKey();
- List<String> value = entry.getValue();
- for (String tpid : value) {
- goodTpList.add(key + "--" + tpid);
+ List<Node> xpdrNodeList = nodeList
+ .stream()
+ .filter(nt -> nt
+ .augmentation(org.opendaylight.yang.gen.v1
+ .http.org.openroadm.common.network.rev181130.Node1.class)
+ .getNodeType().equals(OpenroadmNodeType.XPONDER)).collect(Collectors.toList());
+ Map<String, List<String>> clientPortMap = new HashMap<>();
+ for (Node node : xpdrNodeList) {
+ String nodeId = node.getSupportingNode().values().stream()
+ .filter(sn -> sn.getNetworkRef().getValue().equals(NetworkUtils.UNDERLAY_NETWORK_ID))
+ .findFirst()
+ .get().getNodeRef().getValue();
+ List<String> clientPortList = new ArrayList<>();
+ for (TerminationPoint tp : node.augmentation(Node1.class).getTerminationPoint().values()) {
+ if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERCLIENT)
+ && checkTp(node.getNodeId().getValue(), nodeId, tp, xponderOutLinkList, xponderInLinkList)) {
+ clientPortList.add(tp.getTpId().getValue());
}
}
+ if (!clientPortList.isEmpty()) {
+ clientPortMap.put(nodeId, clientPortList);
+ }
+ }
+ List<String> goodTpList = extractGoodTpList(clientPortMap);
+ // tapi topology creation
+ Map<NameKey, Name> names = new HashMap<>();
+ Name name = new NameBuilder().setValue(ETH_TOPO).setValueName("Topo Name").build();
+ names.put(name.key(), name);
+ Uuid uuid = new Uuid(UUID.nameUUIDFromBytes(ETH_TOPO.getBytes(Charset.forName("UTF-8"))).toString());
+ Map<NodeKey ,org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node>
+ tapiNodeList = new HashMap<>();
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node
+ = createTapiNode(goodTpList);
+ tapiNodeList.put(node.key(), node);
+ return new TopologyBuilder().setName(names).setUuid(uuid).setNode(tapiNodeList).build();
- // tapi topology creation
- List<Name> names = new ArrayList<Name>();
- names.add(new NameBuilder().setValue("topo ethernet").setValueName("Topo Name").build());
- Uuid uuid = new Uuid(UUID.randomUUID().toString());
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node> tapiNodeList =
- new ArrayList<>();
- tapiNodeList.add(createTapiNode(goodTpList));
- Topology topology = new TopologyBuilder().setName(names).setUuid(uuid).setNode(tapiNodeList).build();
- return topology;
- } else {
- return null;
+ }
+
+ private List<String> extractGoodTpList(Map<String, List<String>> clientPortMap) {
+ List<String> goodTpList = new ArrayList<>();
+ for (Map.Entry<String, List<String>> entry : clientPortMap.entrySet()) {
+ String key = entry.getKey();
+ List<String> value = entry.getValue();
+ for (String tpid : value) {
+ goodTpList.add(key + "--" + tpid);
+ }
}
+ return goodTpList;
}
private Topology createAbstractedOtnTopology() {
try {
otnTopo = otnTopoOpt.get().get();
} catch (InterruptedException | ExecutionException | NoSuchElementException e) {
- LOG.error("Impossible to retreive otn-topology from mdsal");
+ LOG.error("Impossible to retreive otn-topology from mdsal",e);
return null;
}
- List<Node> nodeList = otnTopo.getNode();
+ List<Node> nodeList = new ArrayList<>(otnTopo.getNode().values());
List<Node> otnNodeList = nodeList.stream().filter(nt -> nt.augmentation(
org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class)
.getNodeType().equals(OpenroadmNodeType.SWITCH) || nt.augmentation(
org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class)
.getNodeType().equals(OpenroadmNodeType.MUXPDR)).collect(Collectors.toList());
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node> tapiNodeList =
- new ArrayList<>();
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link> tapiLinkList =
- new ArrayList<>();
- Uuid topoUuid = new Uuid(UUID.randomUUID().toString());
+ Map<NodeKey, org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node>
+ tapiNodeList = new HashMap<>();
+ Map<LinkKey, org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link>
+ tapiLinkList = new HashMap<>();
+ Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes(T0_MULTI_LAYER_TOPO.getBytes(Charset.forName("UTF-8")))
+ .toString());
+ ConvertORTopoObjectToTapiTopoObject tapiFactory = new ConvertORTopoObjectToTapiTopoObject(topoUuid);
for (Node node : otnNodeList) {
- ConvertORTopoObjectToTapiTopoObject tapiFactory =
- new ConvertORTopoObjectToTapiTopoObject(node, null, topoUuid);
- tapiFactory.convertNode();
- tapiNodeList.addAll(tapiFactory.getTapiNodes());
- tapiLinkList.addAll(tapiFactory.getTapiLinks());
+ tapiFactory.convertNode(node);
+ tapiNodeList.putAll(tapiFactory.getTapiNodes());
+ tapiLinkList.putAll(tapiFactory.getTapiLinks());
+ }
+ if (otnTopo.augmentation(Network1.class) != null) {
+ List<Link> otnLinkList = new ArrayList<>(otnTopo.augmentation(Network1.class).getLink().values());
+ Collections.sort(otnLinkList, (l1, l2) -> l1.getLinkId().getValue()
+ .compareTo(l2.getLinkId().getValue()));
+ tapiFactory.convertLinks(otnLinkList);
+ tapiLinkList.putAll(tapiFactory.getTapiLinks());
}
- Topology topology = new TopologyBuilder()
- .setName(Arrays.asList(new NameBuilder().setValue("T0 - Multi-layer topology")
- .setValueName("TAPI Topology Name").build()))
- .setUuid(topoUuid)
- .setNode(tapiNodeList)
- .setLink(tapiLinkList).build();
- return topology;
+ Name name = new NameBuilder().setValue(T0_MULTI_LAYER_TOPO).setValueName("TAPI Topology Name").build();
+ return new TopologyBuilder()
+ .setName(Map.of(name.key(), name))
+ .setUuid(topoUuid)
+ .setNode(tapiNodeList)
+ .setLink(tapiLinkList).build();
} else {
return null;
}
private org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node createTapiNode(List<
String> tpList) {
- List<Name> names = new ArrayList<Name>();
- Name name = new NameBuilder().setValueName("node name").setValue("TapiNode1").build();
- names.add(name);
+ Name name = new NameBuilder().setValueName("node name").setValue("TAPI Ethernet Node").build();
List<LayerProtocolName> layerProtocols = new ArrayList<>();
layerProtocols.add(LayerProtocolName.ETH);
- List<OwnedNodeEdgePoint> onepl = new ArrayList<OwnedNodeEdgePoint>();
+ Map<OwnedNodeEdgePointKey, OwnedNodeEdgePoint> onepl = new HashMap<>();
for (int i = 0; i < tpList.size(); i++) {
- List<Name> onedNames = new ArrayList<Name>();
- onedNames.add(new NameBuilder().setValueName("OwnedNodeEdgePoint " + i).setValue(tpList.get(i)).build());
- OwnedNodeEdgePoint onep = new OwnedNodeEdgePointBuilder().setUuid(new Uuid(UUID.randomUUID().toString()))
+ Name onedName = new NameBuilder().setValueName("OwnedNodeEdgePoint " + i).setValue(tpList.get(i)).build();
+ OwnedNodeEdgePoint onep = new OwnedNodeEdgePointBuilder()
+ .setUuid(new Uuid(UUID.nameUUIDFromBytes(("OwnedNodeEdgePoint " + i).getBytes(Charset.forName("UTF-8")))
+ .toString()))
.setLayerProtocolName(LayerProtocolName.ETH).setMappedServiceInterfacePoint(createSIP(1))
.setLinkPortDirection(PortDirection.BIDIRECTIONAL).setLinkPortRole(PortRole.SYMMETRIC)
.setAdministrativeState(AdministrativeState.UNLOCKED).setOperationalState(OperationalState.ENABLED)
- .setLifecycleState(LifecycleState.INSTALLED).setName(onedNames).setTerminationDirection(
+ .setLifecycleState(LifecycleState.INSTALLED).setName(Map.of(onedName.key(), onedName))
+ .setTerminationDirection(
TerminationDirection.BIDIRECTIONAL).setTerminationState(TerminationState.TERMINATEDBIDIRECTIONAL)
.build();
- onepl.add(onep);
+ onepl.put(onep.key(), onep);
}
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node = new NodeBuilder()
- .setUuid(new Uuid(UUID.randomUUID().toString())).setName(names).setLayerProtocolName(layerProtocols)
- .setAdministrativeState(AdministrativeState.UNLOCKED).setOperationalState(OperationalState.ENABLED)
- .setLifecycleState(LifecycleState.INSTALLED).setOwnedNodeEdgePoint(onepl).build();
- return node;
+
+ return new NodeBuilder()
+ .setUuid(new Uuid(UUID.nameUUIDFromBytes(name.getValue().getBytes(Charset.forName("UTF-8")))
+ .toString()))
+ .setName(Map.of(name.key(), name)).setLayerProtocolName(layerProtocols)
+ .setAdministrativeState(AdministrativeState.UNLOCKED)
+ .setOperationalState(OperationalState.ENABLED)
+ .setLifecycleState(LifecycleState.INSTALLED)
+ .setOwnedNodeEdgePoint(onepl)
+ .build();
}
- private List<MappedServiceInterfacePoint> createSIP(int nb) {
- List<MappedServiceInterfacePoint> msipl = new ArrayList<>();
+ private Map<MappedServiceInterfacePointKey, MappedServiceInterfacePoint> createSIP(int nb) {
+ Map<MappedServiceInterfacePointKey, MappedServiceInterfacePoint> msipl = new HashMap<>();
for (int i = 0; i < nb; i++) {
MappedServiceInterfacePoint msip = new MappedServiceInterfacePointBuilder().setServiceInterfacePointUuid(
new Uuid(UUID.randomUUID().toString())).build();
- msipl.add(msip);
+ msipl.put(msip.key(), msip);
}
return msipl;
}
.getAssociatedConnectionMapPort();
@NonNull
KeyedInstanceIdentifier<Mapping, MappingKey> pmIID = InstanceIdentifier.create(
- org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.Network.class)
+ org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.Network.class)
.child(Nodes.class, new NodesKey(nodeIdPortMap)).child(Mapping.class, new MappingKey(networkLcp));
@NonNull
FluentFuture<Optional<Mapping>> mappingOpt = dataBroker.newReadOnlyTransaction().read(
try {
mapping = mappingOpt.get().get();
} catch (InterruptedException | ExecutionException e) {
- LOG.error("Error getting mapping for {}", networkLcp);
+ LOG.error("Error getting mapping for {}", networkLcp,e);
return false;
}
} else {
.getSource().getSourceTp().equals(networkLcp)).count();
count += xpdIn.stream().filter(lk -> lk.getDestination().getDestNode().getValue().equals(nodeIdTopo)
&& lk.getDestination().getDestTp().equals(networkLcp)).count();
- if (count == 2) {
- return true;
- } else {
- return false;
- }
+ return (count == 2);
case "tx":
case "rx":
@Nullable
count += xpdOut.stream().filter(lk -> lk.getSource().getSourceNode().getValue().equals(nodeIdTopo)
&& lk.getSource().getSourceTp().equals(partnerLcp)).count();
}
- if (count == 2) {
- return true;
- } else {
- return false;
- }
+ return (count == 2);
default:
LOG.error("Invalid port direction for {}", networkLcp);
return false;
Code Review / transportpce.git / blobdiff