Modify spectrum assignment management in PCE

[transportpce.git] / pce / src / test / java / org / opendaylight / transportpce / pce / utils / PceTestUtils.java

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java
index 35ee84225d723c519566ee3f54c595d9a7cba987..37518dfaf6325aaf35343f9bf9d39a2b5bb1a21c 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java
@@ -12,21 +12,27 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.junit.Assert;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.transportpce.common.DataStoreContext;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.transportpce.common.converter.XMLDataObjectConverter;
-import org.opendaylight.transportpce.common.converter.api.DataObjectConverter;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.atoz.direction.AToZ;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.resource.Node;
+import org.opendaylight.transportpce.test.DataStoreContext;
+import org.opendaylight.transportpce.test.converter.DataObjectConverter;
+import org.opendaylight.transportpce.test.converter.XMLDataObjectConverter;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestOutput;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.atoz.direction.AToZ;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.atoz.direction.AToZKey;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.pce.resource.resource.resource.Node;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network;
@@ -74,19 +80,23 @@ public final class PceTestUtils {
 
         try (
                 // load openroadm-network
-                Reader gnpyNetwork = new FileReader("src/test/resources/gnpy/gnpy_network.json");
+                Reader gnpyNetwork = new FileReader("src/test/resources/gnpy/gnpy_network.json",
+                        StandardCharsets.UTF_8);
                 // load openroadm-topology
-                Reader gnpyTopo = new FileReader("src/test/resources/gnpy/gnpy_topology.json");
+                Reader gnpyTopo = new FileReader("src/test/resources/gnpy/gnpy_topology.json",
+                        StandardCharsets.UTF_8);
                 JsonReader networkReader = new JsonReader(gnpyNetwork);
                 JsonReader topoReader = new JsonReader(gnpyTopo);
         ) {
 
             Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader,
                     QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks"));
-            saveOpenRoadmNetwork(networks.getNetwork().get(0), NetworkUtils.UNDERLAY_NETWORK_ID, dataBroker);
+            @NonNull
+            List<Network> networkMap = new ArrayList<>(networks.nonnullNetwork().values());
+            saveOpenRoadmNetwork(networkMap.get(0), NetworkUtils.UNDERLAY_NETWORK_ID, dataBroker);
             networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader,
                     QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks"));
-            saveOpenRoadmNetwork(networks.getNetwork().get(0), NetworkUtils.OVERLAY_NETWORK_ID, dataBroker);
+            saveOpenRoadmNetwork(networkMap.get(0), NetworkUtils.UNDERLAY_NETWORK_ID, dataBroker);
         } catch (IOException | ExecutionException | InterruptedException e) {
             LOG.error("Cannot init test ", e);
             Assert.fail("Cannot init test ");
@@ -164,8 +174,9 @@ public final class PceTestUtils {
     }
 
     private static List<String> getNodesFromPath(PathComputationRequestOutput output) {
-        List<AToZ> atozList = output.getResponseParameters().getPathDescription().getAToZDirection().getAToZ();
-        return atozList.stream()
+        @Nullable Map<AToZKey, AToZ> atozList = output.getResponseParameters()
+                .getPathDescription().getAToZDirection().getAToZ();
+        return atozList.values().stream()
                 .filter(aToZ -> {
                     if ((aToZ.getResource() == null) || (aToZ.getResource().getResource() == null)) {
                         LOG.debug("Diversity constraint: Resource of AToZ node {} is null! Skipping this node!",