Use version 13.1.0 of openroadm-network models

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

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
index eaa73adbab052dcd566d3ac8dad06c79667e9898..6825217ac2c91a5dfe7a641d35200c0b954dffb5 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
@@ -18,11 +18,11 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.TerminationPoint1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.TerminationPoint1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
@@ -61,13 +61,13 @@ public final class TopologyUtils {
 
         // Create Destination for link
         DestinationBuilder dstNodeBldr = new DestinationBuilder()
-            .setDestTp(destTp)
+            .setDestTp(new TpId(destTp))
             .setDestNode(new NodeId(dstNode));
 
         // Create Source for the link
         SourceBuilder srcNodeBldr = new SourceBuilder()
             .setSourceNode(new NodeId(srcNode))
-            .setSourceTp(srcTp);
+            .setSourceTp(new TpId(srcTp));
 
         LinkId linkId;
         LinkId oppositeLinkId;
@@ -109,13 +109,13 @@ public final class TopologyUtils {
     public static boolean deleteLinkLinkId(LinkId linkId , NetworkTransactionService networkTransactionService) {
         LOG.info("deleting link for LinkId: {}", linkId.getValue());
         try {
-            InstanceIdentifier.InstanceIdentifierBuilder<Link> linkIID = InstanceIdentifier.builder(Networks.class)
+            InstanceIdentifier.Builder<Link> linkIID = InstanceIdentifier.builder(Networks.class)
                 .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
                 .augmentation(Network1.class).child(Link.class, new LinkKey(linkId));
             java.util.Optional<Link> link =
                 networkTransactionService.read(LogicalDatastoreType.CONFIGURATION,linkIID.build()).get();
             if (link.isPresent()) {
-                LinkBuilder linkBuilder = new LinkBuilder(link.get());
+                LinkBuilder linkBuilder = new LinkBuilder(link.orElseThrow());
                 Link1Builder link1Builder = new Link1Builder(linkBuilder.augmentation(Link1.class));
                 linkBuilder.removeAugmentation(Link1.class);
                 linkBuilder.addAugmentation(link1Builder.build());
@@ -190,9 +190,9 @@ public final class TopologyUtils {
         // update links terminating on the given termination-point
         List<Link> filteredTopoLinks = links.values().stream()
             .filter(l1 -> (l1.getSource().getSourceNode().getValue().equals(abstractNodeid)
-                && l1.getSource().getSourceTp().toString().equals(tpId))
+                && l1.getSource().getSourceTp().getValue().equals(tpId))
                 || (l1.getDestination().getDestNode().getValue().equals(abstractNodeid)
-                && l1.getDestination().getDestTp().toString().equals(tpId)))
+                && l1.getDestination().getDestTp().getValue().equals(tpId)))
             .collect(Collectors.toList());
         List<Link> topoLinks = new ArrayList<>();
         for (Link link : filteredTopoLinks) {
@@ -202,13 +202,13 @@ public final class TopologyUtils {
                     .get(new NodeKey(new NodeId(link.getDestination().getDestNode().getValue())))
                     .augmentation(Node1.class)
                     .getTerminationPoint()
-                    .get(new TerminationPointKey(new TpId(link.getDestination().getDestTp().toString())));
+                    .get(new TerminationPointKey(new TpId(link.getDestination().getDestTp().getValue())));
             } else {
                 otherLinkTp = nodes
                     .get(new NodeKey(new NodeId(link.getSource().getSourceNode().getValue())))
                     .augmentation(Node1.class)
                     .getTerminationPoint()
-                    .get(new TerminationPointKey(new TpId(link.getSource().getSourceTp().toString())));
+                    .get(new TerminationPointKey(new TpId(link.getSource().getSourceTp().getValue())));
             }
             Link1Builder link1Bldr = new Link1Builder(link.augmentation(Link1.class));
             if (tpBldr.augmentation(TerminationPoint1.class).getAdministrativeState().equals(AdminStates.InService)