Migrate networkmodel module to Aluminium

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

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java
index bdf46a6f39b932c9f177ec53aadea60f54bc40cf..f3447e82620847f83350acfc572e5b938fd9cbac 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java
@@ -8,9 +8,8 @@
 
 package org.opendaylight.transportpce.networkmodel;
 
-import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.FluentFuture;
-
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import org.eclipse.jdt.annotation.NonNull;
@@ -38,10 +37,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev
 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.rev180226.networks.network.NodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.NodeKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1Builder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder;
@@ -128,12 +127,11 @@ final class Rdm2XpdrLink {
             tp1Bldr.setXpdrNetworkAttributes(new XpdrNetworkAttributesBuilder()
                 .setTailEquipmentId(destNode + "--" + destTp).build());
         }
-        xpdrTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
+        xpdrTpBldr.addAugmentation(tp1Bldr.build());
+        TerminationPoint newXpdrTp = xpdrTpBldr.build();
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 node1 =
-            new Node1Builder().setTerminationPoint(ImmutableList.of(xpdrTpBldr.build())).build();
-        NodeBuilder nodeBldr = new NodeBuilder()
-            .addAugmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
-            .Node1.class, node1);
+            new Node1Builder().setTerminationPoint(ImmutableMap.of(newXpdrTp.key(),newXpdrTp)).build();
+        NodeBuilder nodeBldr = new NodeBuilder().addAugmentation(node1);
         if (isXponderInput) {
             nodeBldr.setNodeId(new NodeId(destNode));
         } else {
@@ -145,22 +143,22 @@ final class Rdm2XpdrLink {
             = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder()
                 .setLinkType(isXponderInput ? OpenroadmLinkType.XPONDERINPUT : OpenroadmLinkType.XPONDEROUTPUT)
                 .setOppositeLink(LinkIdUtil.getOppositeLinkId(srcNode, srcTp, destNode, destTp));
-        LinkBuilder linkBuilder = TopologyUtils.createLink(srcNode, destNode, srcTp, destTp)
-            .addAugmentation(Link1.class, lnk1bldr.build())
-            .addAugmentation(
-                org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class,
-                lnk2bldr.build());
+        LinkBuilder linkBuilder = TopologyUtils.createLink(srcNode, destNode, srcTp, destTp, null)
+            .addAugmentation(lnk1bldr.build())
+            .addAugmentation(lnk2bldr.build());
 
         LOG.info("Link id in the linkbldr {}", linkBuilder.getLinkId());
         LOG.info("Link with oppo link {}", linkBuilder.augmentation(Link1.class));
-        Network1Builder nwBldr1 = new Network1Builder().setLink(ImmutableList.of(linkBuilder.build()));
+        Link link = linkBuilder.build();
+        Network1Builder nwBldr1 = new Network1Builder().setLink(ImmutableMap.of(link.key(),link));
 
         NetworkId nwId = new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID);
+        Node node = nodeBldr.build();
         NetworkBuilder nwBuilder = new NetworkBuilder()
             .setNetworkId(nwId)
             .withKey(new NetworkKey(nwId))
-            .addAugmentation(Network1.class, nwBldr1.build())
-            .setNode(ImmutableList.of(nodeBldr.build()));
+            .addAugmentation(nwBldr1.build())
+            .setNode(ImmutableMap.of(node.key(),node));
         return nwBuilder;
     }
 
@@ -176,20 +174,19 @@ final class Rdm2XpdrLink {
         ReadTransaction readTransaction = dataBroker.newReadOnlyTransaction();
         @NonNull
         FluentFuture<Optional<TerminationPoint>> tpFf = readTransaction.read(LogicalDatastoreType.CONFIGURATION, iiTp);
-        TerminationPoint tp = null;
         if (tpFf.isDone()) {
-            Optional<TerminationPoint> tpOpt = null;
             try {
+                Optional<TerminationPoint> tpOpt;
                 tpOpt = tpFf.get();
+                if (tpOpt.isPresent()) {
+                    return tpOpt.get();
+                }
             } catch (InterruptedException | ExecutionException e) {
                 LOG.error("Impossible to get tp-id {} of node {} from {}", srcTp, srcNode,
-                    NetworkUtils.OVERLAY_NETWORK_ID);
-            }
-            if (tpOpt.isPresent()) {
-                tp = tpOpt.get();
+                    NetworkUtils.OVERLAY_NETWORK_ID, e);
             }
         }
-        return tp;
+        return null;
     }
 
     private Rdm2XpdrLink() {