update portmapping YANG to store SAPI/DAPI hashmap
[transportpce.git] / olm / src / test / java / org / opendaylight / transportpce / olm / util / TransactionUtils.java
index 9278dd131fbb0eabfde1ef8195c712b7102cc389..c6b2363ea1d126c1ffa7efbc65e225f66b44c743 100644 (file)
@@ -14,24 +14,24 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
 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.rev170228.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.CpToDegree;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.CpToDegreeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.CpToDegree;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.CpToDegreeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfoBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.FiberPmd;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.NodeTypes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev181130.AdminStates;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link.attributes.AmplifiedLink;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link.attributes.amplified.link.SectionElementBuilder;
@@ -69,10 +69,11 @@ public final class TransactionUtils {
 
     }
 
+    @SuppressWarnings("unchecked")
     public static boolean writeTransaction(DataBroker dataBroker, InstanceIdentifier instanceIdentifier,
         DataObject object) {
         ReadWriteTransaction transaction = dataBroker.newReadWriteTransaction();
-        transaction.put(LogicalDatastoreType.CONFIGURATION, instanceIdentifier, object, true);
+        transaction.put(LogicalDatastoreType.CONFIGURATION, instanceIdentifier, object);
         transaction.commit();// submit(Timeouts.DATASTORE_WRITE, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT).get();
         return true;
     }
@@ -115,73 +116,104 @@ public final class TransactionUtils {
 
     public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network
             .rev180226.networks.Network getOverLayNetwork() {
-        NodeBuilder node1Builder = new NodeBuilder();
-        node1Builder.setNodeId(new NodeId("node 1"));
-        node1Builder.withKey(new NodeKey(new NodeId("node 1")));
         List<SupportingNode> supportingNodes1 = new ArrayList<>();
-        supportingNodes1.add(new SupportingNodeBuilder().setNodeRef(new NodeId("node 1"))
-                .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)).build());
-        node1Builder.setSupportingNode(supportingNodes1);
+        supportingNodes1
+            .add(new SupportingNodeBuilder()
+                    .setNodeRef(new NodeId("node 1"))
+                    .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))
+                .build());
+        NodeBuilder node1Builder = new NodeBuilder()
+                .setNodeId(new NodeId("node 1"))
+                .withKey(new NodeKey(new NodeId("node 1")))
+                .setSupportingNode(supportingNodes1);
         List<Node> nodes = new ArrayList<>();
         nodes.add(node1Builder.build());
-        NodeBuilder node2Builder = new NodeBuilder();
-        node2Builder.setNodeId(new NodeId("node 2"));
-        node2Builder.withKey(new NodeKey(new NodeId("node 2")));
         List<SupportingNode> supportingNodes = new ArrayList<>();
-        supportingNodes.add(new SupportingNodeBuilder().setNodeRef(new NodeId("node 2"))
-                .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)).build());
-        node2Builder.setSupportingNode(supportingNodes);
+        supportingNodes
+                .add(new SupportingNodeBuilder()
+                    .setNodeRef(new NodeId("node 2"))
+                    .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))
+                .build());
+        NodeBuilder node2Builder = new NodeBuilder()
+                .setNodeId(new NodeId("node 2"))
+                .withKey(new NodeKey(new NodeId("node 2")))
+                .setSupportingNode(supportingNodes);
         nodes.add(node2Builder.build());
-        NodeBuilder node3Builder = new NodeBuilder();
-        node3Builder.setNodeId(new NodeId("node 3"));
-        node3Builder.withKey(new NodeKey(new NodeId("node 3")));
         List<SupportingNode> supportingNodes3 = new ArrayList<>();
-        supportingNodes3.add(new SupportingNodeBuilder().setNodeRef(new NodeId("node 3"))
-                .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)).build());
-        node3Builder.setSupportingNode(supportingNodes3);
+        supportingNodes3
+            .add(new SupportingNodeBuilder()
+                .setNodeRef(new NodeId("node 3"))
+                .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))
+            .build());
+        NodeBuilder node3Builder = new NodeBuilder()
+                .setNodeId(new NodeId("node 3"))
+                .withKey(new NodeKey(new NodeId("node 3")))
+                .setSupportingNode(supportingNodes3);
         nodes.add(node3Builder.build());
-        NodeBuilder node4Builder = new NodeBuilder();
-        node4Builder.setNodeId(new NodeId("node 4"));
-        node4Builder.withKey(new NodeKey(new NodeId("node 4")));
         List<SupportingNode> supportingNodes4 = new ArrayList<>();
-        supportingNodes4.add(new SupportingNodeBuilder().setNodeRef(new NodeId("node 4"))
-                .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)).build());
-        node4Builder.setSupportingNode(supportingNodes4);
+        supportingNodes4
+            .add(new SupportingNodeBuilder()
+                .setNodeRef(new NodeId("node 4"))
+                .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))
+            .build());
+        NodeBuilder node4Builder = new NodeBuilder()
+                .setNodeId(new NodeId("node 4"))
+                .withKey(new NodeKey(new NodeId("node 4")))
+                .setSupportingNode(supportingNodes4);
         nodes.add(node4Builder.build());
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
-                .networks.NetworkBuilder networkBuilder =
-                new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network
-                        .rev180226.networks.NetworkBuilder();
-        networkBuilder.setNode(nodes);
-        networkBuilder.setNetworkId(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID));
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
-                .networks.Network network = networkBuilder.build();
+        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkBuilder
+            networkBuilder =
+                new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks
+                    .NetworkBuilder()
+                .setNode(nodes)
+                .setNetworkId(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID));
+        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network network =
+            networkBuilder.build();
         Optional.of(network);
         return network;
     }
 
     public static Network1 getNetwork() {
         List<SupportingLink> supportingLinks = new ArrayList<>();
-        SupportingLink supportingLink1 = new SupportingLinkBuilder().setLinkRef("ref1")
-            .setNetworkRef(new NetworkId("net1")).build();
-        SupportingLink supportingLink2 = new SupportingLinkBuilder().setLinkRef("ref2")
-            .setNetworkRef(new NetworkId("net2")).build();
+        SupportingLink supportingLink1 = new SupportingLinkBuilder()
+                .setLinkRef("ref1")
+                .setNetworkRef(new NetworkId("net1"))
+                .build();
+        SupportingLink supportingLink2 = new SupportingLinkBuilder()
+                .setLinkRef("ref2")
+                .setNetworkRef(new NetworkId("net2"))
+                .build();
         supportingLinks.add(supportingLink1);
         supportingLinks.add(supportingLink2);
         List<Link> links = new ArrayList<>();
-        Link link1 = new LinkBuilder().setLinkId(new LinkId("link 1"))
-            .setDestination(new DestinationBuilder().setDestNode(new NodeId("node 1"))
-                .setDestTp("dest tp").build())
-            .setSource(new SourceBuilder().setSourceNode(new NodeId("node 2"))
-                .setSourceTp("src tp").build())
-            .setSupportingLink(supportingLinks).build();
+        Link link1 = new LinkBuilder()
+                .setLinkId(new LinkId("link 1"))
+                .setDestination(
+                    new DestinationBuilder()
+                        .setDestNode(new NodeId("node 1"))
+                        .setDestTp("dest tp").build())
+                .setSource(
+                    new SourceBuilder()
+                        .setSourceNode(new NodeId("node 2"))
+                        .setSourceTp("src tp")
+                        .build())
+            .setSupportingLink(supportingLinks)
+            .build();
 
-        Link link2 = new LinkBuilder().setLinkId(new LinkId("link 2"))
-            .setDestination(new DestinationBuilder().setDestNode(new NodeId("node 3"))
-                .setDestTp("dest tp").build())
-            .setSource(new SourceBuilder().setSourceNode(new NodeId("node 4"))
-                .setSourceTp("src tp").build())
-            .setSupportingLink(supportingLinks).build();
+        Link link2 = new LinkBuilder()
+                .setLinkId(new LinkId("link 2"))
+                .setDestination(
+                    new DestinationBuilder()
+                        .setDestNode(new NodeId("node 3"))
+                        .setDestTp("dest tp")
+                        .build())
+                .setSource(
+                    new SourceBuilder()
+                        .setSourceNode(new NodeId("node 4"))
+                        .setSourceTp("src tp")
+                        .build())
+                .setSupportingLink(supportingLinks)
+                .build();
         links.add(link1);
         links.add(link2);
         Network1 network = new Network1Builder().setLink(links).build();
@@ -338,10 +370,12 @@ public final class TransactionUtils {
         mappingList.add(map1);
         Nodes nodes = new NodesBuilder()
             .setNodeId(nodeId)
-            .setNodeType(NodeTypes.Xpdr)
+            .setNodeInfo(new NodeInfoBuilder()
+                .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes.Xpdr)
+                .setOpenroadmVersion(OpenroadmVersion._121)
+                .build())
             .setCpToDegree(cpList)
             .setMapping(mappingList)
-            .setOpenroadmVersion(Nodes.OpenroadmVersion._121)
             .build();
         return nodes;
     }
@@ -370,10 +404,12 @@ public final class TransactionUtils {
         mappingList.add(map1);
         Nodes nodes = new NodesBuilder()
             .setNodeId(nodeId)
-            .setNodeType(null)
+            .setNodeInfo(new NodeInfoBuilder()
+                .setNodeType(null)
+                .setOpenroadmVersion(OpenroadmVersion._121)
+                .build())
             .setCpToDegree(cpList)
             .setMapping(mappingList)
-            .setOpenroadmVersion(Nodes.OpenroadmVersion._121)
             .build();
         return nodes;
     }
@@ -402,10 +438,12 @@ public final class TransactionUtils {
         mappingList.add(map1);
         Nodes nodes = new NodesBuilder()
             .setNodeId(nodeId)
-            .setNodeType(NodeTypes.Rdm)
+            .setNodeInfo(new NodeInfoBuilder()
+                .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes.Rdm)
+                .setOpenroadmVersion(OpenroadmVersion._121)
+                .build())
             .setCpToDegree(cpList)
             .setMapping(mappingList)
-            .setOpenroadmVersion(Nodes.OpenroadmVersion._121)
             .build();
         return nodes;
     }