X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Ftopology%2FTapiTopologyImpl.java;h=6b23a299c496638f2852d7322908969d5d1457e6;hb=1badcea7eeb5bd7066749900658c06b027c75745;hp=9c4dfcf3e99d750af0098a64f101c1c6e13216c4;hpb=04b9194abd5955a6ce7334a25ee55aa18ed2e776;p=transportpce.git diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java index 9c4dfcf3e..6b23a299c 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java @@ -9,8 +9,9 @@ package org.opendaylight.transportpce.tapi.topology; 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; @@ -25,10 +26,10 @@ import org.opendaylight.mdsal.binding.api.DataBroker; 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; @@ -51,6 +52,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Term 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; @@ -67,9 +69,13 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.ge 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; @@ -80,6 +86,8 @@ import org.slf4j.LoggerFactory; 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) { @@ -94,7 +102,7 @@ public class TapiTopologyImpl implements TapiTopologyService { @Override public ListenableFuture> 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: @@ -118,63 +126,92 @@ public class TapiTopologyImpl implements TapiTopologyService { private Topology createAbstractedOpenroadmTopology() { // read openroadm-topology @NonNull - FluentFuture> 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 nodeList = openroadmTopo.getNode(); - @Nullable - List linkList = openroadmTopo.augmentation(Network1.class).getLink(); - List xponderOutLinkList = linkList.stream().filter(lk -> lk.augmentation(Link1.class).getLinkType() - .equals(OpenroadmLinkType.XPONDEROUTPUT)).collect(Collectors.toList()); - List xponderInLinkList = linkList.stream().filter(lk -> lk.augmentation(Link1.class).getLinkType() - .equals(OpenroadmLinkType.XPONDERINPUT)).collect(Collectors.toList()); + FluentFuture> openroadmTopoOpt = dataBroker.newReadOnlyTransaction() + .read(LogicalDatastoreType.CONFIGURATION, InstanceIdentifiers.OVERLAY_NETWORK_II); + if (!openroadmTopoOpt.isDone()) { + LOG.warn("Cannot get openroadm topology, returning null"); + return null; + } + Optional 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 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> clientPortMap = new HashMap<>(); - for (Node node : xpdrNodeList) { - String nodeId = node.getSupportingNode().get(0).getNodeRef().getValue(); - List 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 nodeList = new ArrayList<>(openroadmTopo.getNode().values()); + List linkList = null; + if (openroadmTopo.augmentation(Network1.class) != null) { + linkList = new ArrayList<>(openroadmTopo.augmentation(Network1.class).getLink().values()); + } else { + linkList = new ArrayList<>(); + } + List xponderOutLinkList = linkList.stream() + .filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.XPONDEROUTPUT)) + .collect(Collectors.toList()); + List xponderInLinkList = linkList.stream() + .filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.XPONDERINPUT)) + .collect(Collectors.toList()); - List goodTpList = new ArrayList<>(); - for (Map.Entry> entry : clientPortMap.entrySet()) { - String key = entry.getKey(); - List value = entry.getValue(); - for (String tpid : value) { - goodTpList.add(key + "--" + tpid); + List 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> 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 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 goodTpList = extractGoodTpList(clientPortMap); + // tapi topology creation + Map 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 + 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 names = new ArrayList(); - names.add(new NameBuilder().setValue("topo ethernet").setValueName("Topo Name").build()); - Uuid uuid = new Uuid(UUID.randomUUID().toString()); - List 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 extractGoodTpList(Map> clientPortMap) { + List goodTpList = new ArrayList<>(); + for (Map.Entry> entry : clientPortMap.entrySet()) { + String key = entry.getKey(); + List value = entry.getValue(); + for (String tpid : value) { + goodTpList.add(key + "--" + tpid); + } } + return goodTpList; } private Topology createAbstractedOtnTopology() { @@ -187,34 +224,40 @@ public class TapiTopologyImpl implements TapiTopologyService { 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 nodeList = otnTopo.getNode(); + List nodeList = new ArrayList<>(otnTopo.getNode().values()); List 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 tapiNodeList = - new ArrayList<>(); - List tapiLinkList = - new ArrayList<>(); - Uuid topoUuid = new Uuid(UUID.randomUUID().toString()); + Map + tapiNodeList = new HashMap<>(); + Map + 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 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; } @@ -241,37 +284,42 @@ public class TapiTopologyImpl implements TapiTopologyService { private org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node createTapiNode(List< String> tpList) { - List names = new ArrayList(); - 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 layerProtocols = new ArrayList<>(); layerProtocols.add(LayerProtocolName.ETH); - List onepl = new ArrayList(); + Map onepl = new HashMap<>(); for (int i = 0; i < tpList.size(); i++) { - List onedNames = new ArrayList(); - 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 createSIP(int nb) { - List msipl = new ArrayList<>(); + private Map createSIP(int nb) { + Map 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; } @@ -284,7 +332,7 @@ public class TapiTopologyImpl implements TapiTopologyService { .getAssociatedConnectionMapPort(); @NonNull KeyedInstanceIdentifier 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> mappingOpt = dataBroker.newReadOnlyTransaction().read( @@ -294,7 +342,7 @@ public class TapiTopologyImpl implements TapiTopologyService { 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 { @@ -310,11 +358,7 @@ public class TapiTopologyImpl implements TapiTopologyService { .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 @@ -331,11 +375,7 @@ public class TapiTopologyImpl implements TapiTopologyService { 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;