Merge changes Icd0ec3e4,Ied393b60,I117bfce8,Ia8e86650,Id583e292

[transportpce.git] / olm / src / test / java / org / opendaylight / transportpce / olm / util / TransactionUtils.java

diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
index 182edb41b5da66923c00341b2d4534fc1f8ae802..b2ac5fb41019e326dd68569f7ac6ddf8e0111283 100644 (file)
--- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
+++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
@@ -10,7 +10,6 @@ package org.opendaylight.transportpce.olm.util;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,18 +18,18 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.CpToDegree;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.CpToDegreeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.CpToDegreeKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.OpenroadmNodeVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.cp.to.degree.CpToDegree;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.cp.to.degree.CpToDegreeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.cp.to.degree.CpToDegreeKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.nodes.NodeInfoBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev191129.FiberPmd;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev191129.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
@@ -54,6 +53,7 @@ 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.topology.rev180226.LinkId;
 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.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.LinkKey;
@@ -74,7 +74,10 @@ public final class TransactionUtils {
 
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked","rawtypes"})
+    // FIXME check if the InstanceIdentifier raw type can be avoided
+    // Raw types use are discouraged since they lack type safety.
+    // Resulting Problems are observed at run time and not at compile time
     public static boolean writeTransaction(DataBroker dataBroker, InstanceIdentifier instanceIdentifier,
         DataObject object) {
         ReadWriteTransaction transaction = dataBroker.newReadWriteTransaction();
@@ -178,11 +181,11 @@ public final class TransactionUtils {
     public static Network1 getNetwork() {
         Map<SupportingLinkKey,SupportingLink> supportingLinks = new HashMap<>();
         SupportingLink supportingLink1 = new SupportingLinkBuilder()
-                .setLinkRef("ref1")
+                .setLinkRef(new LinkId("ref1"))
                 .setNetworkRef(new NetworkId("net1"))
                 .build();
         SupportingLink supportingLink2 = new SupportingLinkBuilder()
-                .setLinkRef("ref2")
+                .setLinkRef(new LinkId("ref2"))
                 .setNetworkRef(new NetworkId("net2"))
                 .build();
         supportingLinks.put(supportingLink1.key(),supportingLink1);
@@ -193,11 +196,11 @@ public final class TransactionUtils {
                 .setDestination(
                     new DestinationBuilder()
                         .setDestNode(new NodeId("node 1"))
-                        .setDestTp("dest tp").build())
+                        .setDestTp(new TpId("dest tp")).build())
                 .setSource(
                     new SourceBuilder()
                         .setSourceNode(new NodeId("node 2"))
-                        .setSourceTp("src tp")
+                        .setSourceTp(new TpId("src tp"))
                         .build())
             .setSupportingLink(supportingLinks)
             .build();
@@ -207,12 +210,12 @@ public final class TransactionUtils {
                 .setDestination(
                     new DestinationBuilder()
                         .setDestNode(new NodeId("node 3"))
-                        .setDestTp("dest tp")
+                        .setDestTp(new TpId("dest tp"))
                         .build())
                 .setSource(
                     new SourceBuilder()
                         .setSourceNode(new NodeId("node 4"))
-                        .setSourceTp("src tp")
+                        .setSourceTp(new TpId("src tp"))
                         .build())
                 .setSupportingLink(supportingLinks)
                 .build();
@@ -277,7 +280,6 @@ public final class TransactionUtils {
             .setSectionEltNumber(Uint16.valueOf(1)).build();
         amplifiedLinkValues.put(al.key(),al);
         amplifiedLinkValues.put(al2.key(),al2);
-        Map<Class<? extends Augmentation<Link>>, Augmentation<Link>> map = Collections.emptyMap();
         Augmentation<Link> aug1 = new Link1Builder()
             .setAmplified(true)
             .setOMSAttributes(new OMSAttributesBuilder()
@@ -294,27 +296,27 @@ public final class TransactionUtils {
             .build();
 
         Map<SupportingLinkKey,SupportingLink> supportingLinks = new HashMap<>();
-        SupportingLink supportingLink = new SupportingLinkBuilder().setLinkRef("ref1")
+        SupportingLink supportingLink = new SupportingLinkBuilder().setLinkRef(new LinkId("ref1"))
             .setNetworkRef(new NetworkId("net1")).build();
-        SupportingLink supportingLink2 = new SupportingLinkBuilder().setLinkRef("ref2")
+        SupportingLink supportingLink2 = new SupportingLinkBuilder().setLinkRef(new LinkId("ref2"))
             .setNetworkRef(new NetworkId("net1")).build();
         supportingLinks.put(supportingLink.key(),supportingLink);
         supportingLinks.put(supportingLink2.key(),supportingLink2);
         Map<LinkKey,Link> links = new HashMap<>();
         Link link1 = new LinkBuilder().setLinkId(new LinkId("link 1"))
             .setDestination(new DestinationBuilder().setDestNode(new NodeId("node 1"))
-                .setDestTp("dest tp").build())
+                .setDestTp(new TpId("dest tp")).build())
             .setSource(new SourceBuilder().setSourceNode(new NodeId("node 2"))
-                .setSourceTp("src tp").build())
+                .setSourceTp(new TpId("src tp")).build())
             .setSupportingLink(supportingLinks)
             .addAugmentation(aug1)
             .addAugmentation(aug2).build();
 
         Link link2 = new LinkBuilder().setLinkId(new LinkId("link 2"))
             .setDestination(new DestinationBuilder().setDestNode(new NodeId("node 3"))
-                .setDestTp("dest tp").build())
+                .setDestTp(new TpId("dest tp")).build())
             .setSource(new SourceBuilder().setSourceNode(new NodeId("node 4"))
-                .setSourceTp("src tp").build())
+                .setSourceTp(new TpId("src tp")).build())
             .setSupportingLink(supportingLinks).build();
         links.put(link1.key(),link1);
         links.put(link2.key(),link2);
@@ -356,16 +358,15 @@ public final class TransactionUtils {
             .setSupportingPort("port")
             .withKey(new MappingKey((mappingKey != null) ? mappingKey : "null"))
             .build();
-        Nodes nodes = new NodesBuilder()
+        return new NodesBuilder()
             .setNodeId(nodeId)
             .setNodeInfo(new NodeInfoBuilder()
                 .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes.Xpdr)
-                .setOpenroadmVersion(OpenroadmVersion._121)
+                .setOpenroadmVersion(OpenroadmNodeVersion._121)
                 .build())
             .setCpToDegree(cpList)
             .setMapping(Map.of(map1.key(),map1))
             .build();
-        return nodes;
     }
 
     public static Nodes getNodes2(String nodeId, String mappingKey) {
@@ -388,16 +389,15 @@ public final class TransactionUtils {
             .setSupportingPort("port")
             .withKey(new MappingKey((mappingKey != null) ? mappingKey : "null"))
             .build();
-        Nodes nodes = new NodesBuilder()
+        return new NodesBuilder()
             .setNodeId(nodeId)
             .setNodeInfo(new NodeInfoBuilder()
                 .setNodeType(null)
-                .setOpenroadmVersion(OpenroadmVersion._121)
+                .setOpenroadmVersion(OpenroadmNodeVersion._121)
                 .build())
             .setCpToDegree(cpList)
             .setMapping(Map.of(map1.key(),map1))
             .build();
-        return nodes;
     }
 
     public static Nodes getNodes3(String nodeId, String mappingKey) {
@@ -420,16 +420,15 @@ public final class TransactionUtils {
             .setSupportingPort("port")
             .withKey(new MappingKey((mappingKey != null) ? mappingKey : "null"))
             .build();
-        Nodes nodes = new NodesBuilder()
+        return new NodesBuilder()
             .setNodeId(nodeId)
             .setNodeInfo(new NodeInfoBuilder()
                 .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes.Rdm)
-                .setOpenroadmVersion(OpenroadmVersion._121)
+                .setOpenroadmVersion(OpenroadmNodeVersion._121)
                 .build())
             .setCpToDegree(cpList)
             .setMapping(Map.of(map1.key(),map1))
             .build();
-        return nodes;
     }
 
     public static void writeNodeTransaction(String nodeId, DataBroker dataBroker, String mappingKey) {