Phosphorus migration

[transportpce.git] / networkmodel / src / main / java / org / opendaylight / transportpce / networkmodel / util / OpenRoadmOtnTopology.java

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
index 649852dba6af94fadf8c7596bf9601a2827b923e..dd5325563b63418553daa1dddc46c4217a871d8a 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
@@ -146,9 +146,9 @@ public final class OpenRoadmOtnTopology {
         }
         if (links.size() == 2) {
             links.addAll(initialiseOtnLinks(suppOtuLinks.get(0).getSource().getSourceNode().getValue(),
-                suppOtuLinks.get(0).getSource().getSourceTp().toString(),
+                suppOtuLinks.get(0).getSource().getSourceTp().getValue(),
                 suppOtuLinks.get(0).getDestination().getDestNode().getValue(),
-                suppOtuLinks.get(0).getDestination().getDestTp().toString(),
+                suppOtuLinks.get(0).getDestination().getDestTp().getValue(),
                 linkType));
         }
         List<TerminationPoint> tps = new ArrayList<>();
@@ -671,7 +671,7 @@ public final class OpenRoadmOtnTopology {
                 SupportingTerminationPoint stp = new SupportingTerminationPointBuilder()
                     .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
                     .setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
-                    .setTpRef(tpId.getValue())
+                    .setTpRef(tpId)
                     .build();
                 TerminationPoint ietfTpNw = buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, Map.of(stp.key(), stp),
                     mapping);
@@ -752,20 +752,16 @@ public final class OpenRoadmOtnTopology {
                     .setOperationalState(TopologyUtils.setNetworkOperState(mapping.getPortOperState()))
                     .build();
 
-        ietfTpBldr.setTpId(tpId)
-            .withKey(new TerminationPointKey(tpId))
-            .addAugmentation(otnTp1)
-            .addAugmentation(ocnTp);
-        return ietfTpBldr.build();
+        return ietfTpBldr.setTpId(tpId)
+                .withKey(new TerminationPointKey(tpId))
+                .addAugmentation(otnTp1)
+                .addAugmentation(ocnTp)
+                .build();
     }
 
     private static String formatNodeName(String nodeName, String tpName) {
-        String newNodeName = null;
-        if (nodeName.contains(XPDR)) {
-            newNodeName = nodeName;
-        } else {
-            newNodeName = new StringBuilder(nodeName).append("-").append(tpName.split("-")[0]).toString();
-        }
-        return newNodeName;
+        return nodeName.contains(XPDR)
+                ? nodeName
+                : new StringBuilder(nodeName).append("-").append(tpName.split("-")[0]).toString();
     }
 }