TAPI topology consolidation
[transportpce.git] / tapi / src / main / java / org / opendaylight / transportpce / tapi / topology / TapiTopologyImpl.java
index 0943a8961a78f3e23f31d1568188502f2c4ee494..4a6625632055646ee1fddec16f42b45f298290ec 100644 (file)
@@ -11,11 +11,12 @@ 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.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -26,15 +27,16 @@ 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;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmNodeType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1;
@@ -52,6 +54,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;
@@ -68,9 +71,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;
@@ -97,58 +104,34 @@ public class TapiTopologyImpl implements TapiTopologyService {
 
     @Override
     public ListenableFuture<RpcResult<GetTopologyDetailsOutput>> getTopologyDetails(GetTopologyDetailsInput input) {
-        LOG.info("Building TAPI Topology abstraction from {}", input.getTopologyIdOrName());
-        Topology topology = null;
-        switch (input.getTopologyIdOrName()) {
-            case NetworkUtils.OVERLAY_NETWORK_ID:
-                topology = createAbstractedOpenroadmTopology();
-                break;
-            case NetworkUtils.OTN_NETWORK_ID:
-                topology = createAbstractedOtnTopology();
-                break;
-            default:
-                LOG.error("{} unknown - can not be abstracted", input.getTopologyIdOrName());
-                break;
-        }
-        if (topology != null) {
+        try {
+            LOG.info("Building TAPI Topology abstraction from {}", input.getTopologyIdOrName());
+            Topology topology = null;
+            switch (input.getTopologyIdOrName()) {
+                case NetworkUtils.OVERLAY_NETWORK_ID:
+                    topology = createAbstractedOpenroadmTopology();
+                    break;
+                case NetworkUtils.OTN_NETWORK_ID:
+                    topology = createAbstractedOtnTopology();
+                    break;
+                default:
+                    LOG.error("{} unknown - can not be abstracted", input.getTopologyIdOrName());
+                    break;
+            }
             return RpcResultBuilder.success(new GetTopologyDetailsOutputBuilder().setTopology(topology).build())
                 .buildFuture();
-        } else {
+        } catch (TapiTopologyException e) {
             return RpcResultBuilder.success(new GetTopologyDetailsOutputBuilder().build()).buildFuture();
         }
     }
 
-    private Topology createAbstractedOpenroadmTopology() {
+    private Topology createAbstractedOpenroadmTopology() throws TapiTopologyException {
         // read openroadm-topology
-        @NonNull
-        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;
-        }
-
-        if (!optionalOpenroadmTop.isPresent()) {
-            LOG.warn("Openroadm topology is not present, returning null");
-            return null;
-        }
-        Network openroadmTopo = optionalOpenroadmTop.get();
-        List<Node> nodeList = openroadmTopo.getNode();
+        Network openroadmTopo = readTopology(InstanceIdentifiers.OVERLAY_NETWORK_II);
+        List<Node> xpdrNodeList = pruneOpenroadmNodes(openroadmTopo);
         List<Link> linkList = null;
         if (openroadmTopo.augmentation(Network1.class) != null) {
-            linkList = openroadmTopo.augmentation(Network1.class).getLink();
+            linkList = new ArrayList<>(openroadmTopo.augmentation(Network1.class).getLink().values());
         } else {
             linkList = new ArrayList<>();
         }
@@ -158,18 +141,14 @@ public class TapiTopologyImpl implements TapiTopologyService {
         List<Link> xponderInLinkList = linkList.stream()
                 .filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.XPONDERINPUT))
                 .collect(Collectors.toList());
-
-        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();
+            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()) {
+            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());
@@ -181,14 +160,40 @@ public class TapiTopologyImpl implements TapiTopologyService {
         }
         List<String> goodTpList = extractGoodTpList(clientPortMap);
         // tapi topology creation
-        List<Name> names = new ArrayList<>();
-        names.add(new NameBuilder().setValue(ETH_TOPO).setValueName("Topo Name").build());
+        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());
-        List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node>
-            tapiNodeList = new ArrayList<>();
-        tapiNodeList.add(createTapiNode(goodTpList));
+        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();
+    }
+
+    private Network readTopology(InstanceIdentifier<Network> networkIID)
+        throws TapiTopologyException {
+        Network topology = null;
+        FluentFuture<Optional<Network>> topologyFuture = dataBroker.newReadOnlyTransaction()
+            .read(LogicalDatastoreType.CONFIGURATION, networkIID);
+        try {
+            topology = topologyFuture.get().get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new TapiTopologyException("Unable to get from mdsal topology: " + networkIID
+                .firstKeyOf(Network.class).getNetworkId().getValue(), e);
+        } catch (ExecutionException e) {
+            throw new TapiTopologyException("Unable to get from mdsal topology: " + networkIID
+                .firstKeyOf(Network.class).getNetworkId().getValue(), e);
+        }
+        return topology;
+    }
 
+    private List<Node> pruneOpenroadmNodes(Network openroadmTopo) {
+        return openroadmTopo.getNode().values().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());
     }
 
     private List<String> extractGoodTpList(Map<String, List<String>> clientPortMap) {
@@ -203,47 +208,84 @@ public class TapiTopologyImpl implements TapiTopologyService {
         return goodTpList;
     }
 
-    private Topology createAbstractedOtnTopology() {
+    private Topology createAbstractedOtnTopology() throws TapiTopologyException {
+        // read openroadm-topology
+        Network openroadmTopo = readTopology(InstanceIdentifiers.OVERLAY_NETWORK_II);
+        List<Link> linkList = new ArrayList<>();
+        if (openroadmTopo.augmentation(Network1.class) != null) {
+            linkList.addAll(openroadmTopo.augmentation(Network1.class).getLink().values());
+        }
+        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());
         // read otn-topology
-        @NonNull
-        FluentFuture<Optional<Network>> otnTopoOpt = dataBroker.newReadOnlyTransaction().read(
-            LogicalDatastoreType.CONFIGURATION, InstanceIdentifiers.OTN_NETWORK_II);
-        if (otnTopoOpt.isDone()) {
-            Network otnTopo = null;
-            try {
-                otnTopo = otnTopoOpt.get().get();
-            } catch (InterruptedException | ExecutionException | NoSuchElementException e) {
-                LOG.error("Impossible to retreive otn-topology from mdsal",e);
-                return null;
-            }
-            List<Node> nodeList = otnTopo.getNode();
-            List<Node> otnNodeList = nodeList.stream().filter(nt -> nt.augmentation(
+        Network otnTopo = readTopology(InstanceIdentifiers.OTN_NETWORK_II);
+        Map<NodeId, Node> otnNodeMap = otnTopo.nonnullNode().values().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.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.nameUUIDFromBytes(T0_MULTI_LAYER_TOPO.getBytes(Charset.forName("UTF-8")))
-                .toString());
-            for (Node node : otnNodeList) {
-                ConvertORTopoObjectToTapiTopoObject tapiFactory =
-                    new ConvertORTopoObjectToTapiTopoObject(node, null, topoUuid);
-                tapiFactory.convertNode();
-                tapiNodeList.addAll(tapiFactory.getTapiNodes());
-                tapiLinkList.addAll(tapiFactory.getTapiLinks());
+                .getNodeType().equals(OpenroadmNodeType.MUXPDR))
+            .collect(Collectors.toMap(Node::getNodeId, node -> node));
+
+        Map<String, List<String>> networkPortMap = new HashMap<>();
+        Iterator<Entry<NodeId, Node>> itOtnNodeMap = otnNodeMap.entrySet().iterator();
+        while (itOtnNodeMap.hasNext()) {
+            Entry<NodeId, Node> entry = itOtnNodeMap.next();
+            String portMappingNodeId = entry.getValue().getSupportingNode().values().stream()
+                .filter(sn -> sn.getNetworkRef().getValue().equals(NetworkUtils.UNDERLAY_NETWORK_ID))
+                .findFirst()
+                .get().getNodeRef().getValue();
+            List<String> networkPortList = new ArrayList<>();
+            for (TerminationPoint tp : entry.getValue().augmentation(Node1.class).getTerminationPoint().values()) {
+                if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)
+                    &&
+                    checkTp(entry.getKey().getValue(), portMappingNodeId, tp, xponderOutLinkList, xponderInLinkList)) {
+                    networkPortList.add(tp.getTpId().getValue());
+                }
+            }
+            if (!networkPortList.isEmpty()) {
+                networkPortMap.put(entry.getKey().getValue(), networkPortList);
             }
-            return new TopologyBuilder()
-                    .setName(Arrays.asList(new NameBuilder().setValue(T0_MULTI_LAYER_TOPO)
-                            .setValueName("TAPI Topology Name").build()))
-                    .setUuid(topoUuid)
-                    .setNode(tapiNodeList)
-                    .setLink(tapiLinkList).build();
+        }
+        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());
+        ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topoUuid);
+        Iterator<Entry<String, List<String>>> it = networkPortMap.entrySet().iterator();
+        while (it.hasNext()) {
+            String nodeId = it.next().getKey();
+            tapiFactory.convertNode(otnNodeMap.get(new NodeId(nodeId)), networkPortMap.get(nodeId));
+            tapiNodeList.putAll(tapiFactory.getTapiNodes());
+            tapiLinkList.putAll(tapiFactory.getTapiLinks());
+        }
+        if (openroadmTopo.nonnullNode().values().stream().filter(nt ->
+                nt.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class)
+                .getNodeType().equals(OpenroadmNodeType.SRG)).count() > 0) {
+            tapiFactory.convertRoadmInfrastructure();
+            tapiNodeList.putAll(tapiFactory.getTapiNodes());
+            tapiLinkList.putAll(tapiFactory.getTapiLinks());
         } else {
-            return null;
+            LOG.warn("Unable to abstract an ROADM infrasctructure from openroadm-topology");
+        }
+        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());
         }
+        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();
     }
 
     @Override
@@ -267,31 +309,29 @@ 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<Name> names = new ArrayList<>();
         Name name = new NameBuilder().setValueName("node name").setValue("TAPI Ethernet Node").build();
-        names.add(name);
         List<LayerProtocolName> layerProtocols = new ArrayList<>();
         layerProtocols.add(LayerProtocolName.ETH);
-        List<OwnedNodeEdgePoint> onepl = new ArrayList<>();
+        Map<OwnedNodeEdgePointKey, OwnedNodeEdgePoint> onepl = new HashMap<>();
         for (int i = 0; i < tpList.size(); i++) {
-            List<Name> onedNames = new ArrayList<>();
-            onedNames.add(new NameBuilder().setValueName("OwnedNodeEdgePoint " + i).setValue(tpList.get(i)).build());
+            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);
         }
 
         return new NodeBuilder()
                 .setUuid(new Uuid(UUID.nameUUIDFromBytes(name.getValue().getBytes(Charset.forName("UTF-8")))
                     .toString()))
-                .setName(names).setLayerProtocolName(layerProtocols)
+                .setName(Map.of(name.key(), name)).setLayerProtocolName(layerProtocols)
                 .setAdministrativeState(AdministrativeState.UNLOCKED)
                 .setOperationalState(OperationalState.ENABLED)
                 .setLifecycleState(LifecycleState.INSTALLED)
@@ -299,25 +339,29 @@ public class TapiTopologyImpl implements TapiTopologyService {
                 .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;
     }
 
     private boolean checkTp(String nodeIdTopo, String nodeIdPortMap, TerminationPoint tp, List<Link> xpdOut, List<
         Link> xpdIn) {
-        @Nullable
-        String networkLcp = tp.augmentation(
-            org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1.class)
-            .getAssociatedConnectionMapPort();
+        String networkLcp;
+        if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERCLIENT)) {
+            networkLcp = tp.augmentation(
+                org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1.class)
+                .getAssociatedConnectionMapPort();
+        } else {
+            networkLcp = tp.getTpId().getValue();
+        }
         @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(