Replace tpce-topology yang by existing ordmodels

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

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
index 5384547bd442dcab3d021aced721badc81e5381e..d53b05567e9350ae0b22f44d0a74eac1f6a9b6c4 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
@@ -15,6 +15,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -224,22 +225,19 @@ public final class OpenRoadmTopology {
             if (isOtn && m.getPortQual().equals("xpdr-client")) {
                 continue;
             }
+            org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1Builder
+                    ocnTp1Bldr = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+                    .TerminationPoint1Builder()
+                    .setTpType(PORTQUAL_ORD_TYPE_MAP.get(m.getPortQual()))
+                    .setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState()))
+                    .setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState()));
+            if (!isOtn && m.getConnectionMapLcp() != null) {
+                ocnTp1Bldr.setAssociatedConnectionMapTp(Set.of(new TpId(m.getConnectionMapLcp())));
+            }
             TerminationPointBuilder ietfTpBldr = createTpBldr(m.getLogicalConnectionPoint())
                 .addAugmentation(
                     // Add openroadm-network-topology tp augmentations
-                    new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
-                            .TerminationPoint1Builder()
-                        .setTpType(PORTQUAL_ORD_TYPE_MAP.get(m.getPortQual()))
-                        .setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState()))
-                        .setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState()))
-                        .build());
-            if (!isOtn) {
-                ietfTpBldr.addAugmentation(
-                    new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123
-                            .TerminationPoint1Builder()
-                        .setAssociatedConnectionMapPort(m.getConnectionMapLcp())
-                        .build());
-            }
+                        ocnTp1Bldr.build());
             TerminationPoint ietfTp = ietfTpBldr.build();
             tpMap.put(ietfTp.key(),ietfTp);
         }