X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceOpticalNodeTest.java;fp=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceOpticalNodeTest.java;h=aa4baad564880b26a018ebb2655bf3b721add0e4;hb=98de423782828b8b44b9cb341a581e1e90a16971;hp=f32a42d7bcd153af98a48b61297a514204758a1c;hpb=82d93922dcc41353c92d092d25d110b4f4d48c62;p=transportpce.git

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
index f32a42d7b..aa4baad56 100644
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
@@ -8,18 +8,16 @@
 
 package org.opendaylight.transportpce.pce.networkanalyzer;
 
-import com.google.common.collect.ImmutableList;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.pce.utils.TransactionUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.node.attributes.AvailableWavelengths;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.node.attributes.AvailableWavelengthsBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.DegreeAttributes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.DegreeAttributesBuilder;
@@ -43,10 +41,12 @@ 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.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNode;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNodeKey;
 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.node.TerminationPoint;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class PceOpticalNodeTest extends AbstractTest {
 
@@ -190,72 +190,68 @@ public class PceOpticalNodeTest extends AbstractTest {
         Assert.assertTrue(pceOpticalNode.checkTP("testTP"));
     }
 
-    private List<SupportingNode> geSupportingNodes() {
-        List<SupportingNode> supportingNodes1 = new ArrayList<>();
+    private Map<SupportingNodeKey,SupportingNode> geSupportingNodes() {
+        Map<SupportingNodeKey,SupportingNode> supportingNodes1 = new HashMap<>();
+        SupportingNode supportingNode1 = new SupportingNodeBuilder()
+                .setNodeRef(new NodeId("node 1"))
+                .setNetworkRef(new NetworkId(NetworkUtils.CLLI_NETWORK_ID))
+                .build();
         supportingNodes1
-                .add(new SupportingNodeBuilder()
-                        .setNodeRef(new NodeId("node 1"))
-                        .setNetworkRef(new NetworkId(NetworkUtils.CLLI_NETWORK_ID))
-                        .build());
+                .put(supportingNode1.key(),supportingNode1);
 
+        SupportingNode supportingNode2 = new SupportingNodeBuilder()
+                .setNodeRef(new NodeId("node 2"))
+                .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))
+                .build();
         supportingNodes1
-                .add(new SupportingNodeBuilder()
-                        .setNodeRef(new NodeId("node 2"))
-                        .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))
-                        .build());
+                .put(supportingNode2.key(),supportingNode2);
         return supportingNodes1;
     }
 
-    private NodeBuilder getNodeBuilder(List<SupportingNode> supportingNodes1, OpenroadmTpType openroadmTpType) {
+    private NodeBuilder getNodeBuilder(Map<SupportingNodeKey,SupportingNode> supportingNodes1,
+            OpenroadmTpType openroadmTpType) {
 
         TerminationPoint1Builder tp1Bldr = getTerminationPoint1Builder(openroadmTpType);
         TerminationPointBuilder xpdrTpBldr = getTerminationPointBuilder();
-        xpdrTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
-        xpdrTpBldr.addAugmentation(
-                org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1.class,
-                createAnotherTerminationPoint().build());
+        xpdrTpBldr.addAugmentation(tp1Bldr.build());
+        xpdrTpBldr.addAugmentation(createAnotherTerminationPoint().build());
         org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1 node1 = getNode1();
+        TerminationPoint xpdr = xpdrTpBldr.build();
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 node1Rev180226 =
                 new Node1Builder()
-                        .setTerminationPoint(ImmutableList.of(xpdrTpBldr.build()))
+                        .setTerminationPoint(Map.of(xpdr.key(),xpdr))
                         .build();
 
 
         return new NodeBuilder()
                 .setNodeId(new NodeId("node_test"))
                 .withKey(new NodeKey(new NodeId("node 1")))
-                .addAugmentation(
-                        Node1.class, node1Rev180226)
-                .addAugmentation(
-                        org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1.class,
-                        node1)
+                .addAugmentation(node1Rev180226)
+                .addAugmentation(node1)
                 .setSupportingNode(supportingNodes1);
     }
 
-    private NodeBuilder getNodeBuilderEmpty(List<SupportingNode> supportingNodes1, OpenroadmTpType openroadmTpType) {
+    private NodeBuilder getNodeBuilderEmpty(Map<SupportingNodeKey,SupportingNode>  supportingNodes1,
+            OpenroadmTpType openroadmTpType) {
 
         TerminationPoint1Builder tp1Bldr = getTerminationPoint1Builder(openroadmTpType);
         TerminationPointBuilder xpdrTpBldr = getTerminationPointBuilder();
-        xpdrTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
-        xpdrTpBldr.addAugmentation(
-                org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1.class,
-                createAnotherTerminationPoint().build());
+        xpdrTpBldr.addAugmentation(tp1Bldr.build());
+        xpdrTpBldr.addAugmentation(createAnotherTerminationPoint().build());
 
         org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1 node1 = getNode1Empty();
+        TerminationPoint xpdr = xpdrTpBldr.build();
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 node1Rev180226 =
                 new Node1Builder()
-                        .setTerminationPoint(ImmutableList.of(xpdrTpBldr.build()))
+                        .setTerminationPoint(Map.of(xpdr.key(),xpdr))
                         .build();
 
 
         return new NodeBuilder()
                 .setNodeId(new NodeId("node_test"))
                 .withKey(new NodeKey(new NodeId("node 1")))
-                .addAugmentation(
-                        Node1.class, node1Rev180226)
-                .addAugmentation(
-                        org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1.class,
-                        node1)
+                .addAugmentation(node1Rev180226)
+                .addAugmentation(node1)
                 .setSupportingNode(supportingNodes1);
     }
 
@@ -276,9 +272,9 @@ public class PceOpticalNodeTest extends AbstractTest {
     }
 
     private DegreeAttributes getDegAttributes() {
+        AvailableWavelengths aval = new AvailableWavelengthsBuilder().setIndex(Uint32.valueOf(20)).build();
         return (new DegreeAttributesBuilder())
-                .setAvailableWavelengths(
-                        Collections.singletonList(new AvailableWavelengthsBuilder().setIndex(20L).build()))
+                .setAvailableWavelengths(Map.of(aval.key(),aval))
                 .build();
     }
 
@@ -288,15 +284,12 @@ public class PceOpticalNodeTest extends AbstractTest {
 
     private DegreeAttributes getEmptyDegAttributes() {
         return (new DegreeAttributesBuilder())
-                .setAvailableWavelengths(new ArrayList<>())
+                .setAvailableWavelengths(Map.of())
                 .build();
     }
 
     private SrgAttributes getEmptySrgAttributes() {
-        List<org.opendaylight.yang.gen
-                .v1.http.org.openroadm.srg.rev181130.srg.node.attributes.AvailableWavelengths>
-                waveList = new ArrayList<>();
-        return new SrgAttributesBuilder().setAvailableWavelengths(waveList).build();
+        return new SrgAttributesBuilder().setAvailableWavelengths(Map.of()).build();
     }
 
     private TerminationPointBuilder getTerminationPointBuilder() {
@@ -314,11 +307,11 @@ public class PceOpticalNodeTest extends AbstractTest {
         return new org.opendaylight
                 .yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1Builder()
                 .setTpType(OpenroadmTpType.XPONDERNETWORK)
-                .setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build())
-                .setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build())
-                .setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build())
-                .setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build())
-                .setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(new ArrayList<>()).build())
+                .setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(Map.of()).build())
+                .setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(Map.of()).build())
+                .setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(Map.of()).build())
+                .setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(Map.of()).build())
+                .setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(Map.of()).build())
                 .setXpdrClientAttributes((new XpdrClientAttributesBuilder()).build())
                 .setXpdrPortAttributes((new XpdrPortAttributesBuilder()).build())
                 .setXpdrNetworkAttributes(new XpdrNetworkAttributesBuilder()