Adapt TransportPCE code to Sulfur

[transportpce.git] / pce / src / main / java / org / opendaylight / transportpce / pce / networkanalyzer / PceCalculation.java

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
index e171115550880d3a11271425df50538fd58a4b19..a817bec4aaed44050e6d259f0b4288c60f09a309 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
@@ -12,11 +12,9 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -76,7 +74,7 @@ public class PceCalculation {
     ///////////// Intermediate data/////////////////
     private List<PceLink> addLinks = new ArrayList<>();
     private List<PceLink> dropLinks = new ArrayList<>();
-    private HashSet<NodeId> azSrgs = new HashSet<>();
+    private List<NodeId> azSrgs = new ArrayList<>();
 
     private PceNode aendPceNode = null;
     private PceNode zendPceNode = null;
@@ -89,7 +87,7 @@ public class PceCalculation {
     // this List serves calculation of ZtoA path description
     // TODO maybe better solution is possible
     private Map<LinkId, PceLink> allPceLinks = new HashMap<>();
-    private Set<LinkId> linksToExclude = new HashSet<>();
+    private List<LinkId> linksToExclude = new ArrayList<>();
     private PceResult returnStructure;
     private PortMapping portMapping;
 
@@ -793,11 +791,11 @@ public class PceCalculation {
         for (McCapabilities mcCapabitility : mcCapabilities) {
             if (mcCapabitility.getMcNodeName().contains("XPDR")
                     && mcCapabitility.getSlotWidthGranularity() != null) {
-                return mcCapabitility.getSlotWidthGranularity().getValue();
+                return mcCapabitility.getSlotWidthGranularity().getValue().decimalValue();
             }
             if (mcCapabitility.getMcNodeName().contains(moduleName)
                     && mcCapabitility.getSlotWidthGranularity() != null) {
-                return mcCapabitility.getSlotWidthGranularity().getValue();
+                return mcCapabitility.getSlotWidthGranularity().getValue().decimalValue();
             }
         }
         return GridConstant.SLOT_WIDTH_50;
@@ -819,11 +817,11 @@ public class PceCalculation {
         for (McCapabilities mcCapabitility : mcCapabilities) {
             if (mcCapabitility.getMcNodeName().contains("XPDR")
                     && mcCapabitility.getCenterFreqGranularity() != null) {
-                return mcCapabitility.getCenterFreqGranularity().getValue();
+                return mcCapabitility.getCenterFreqGranularity().getValue().decimalValue();
             }
             if (mcCapabitility.getMcNodeName().contains(moduleName)
                     && mcCapabitility.getCenterFreqGranularity() != null) {
-                return mcCapabitility.getCenterFreqGranularity().getValue();
+                return mcCapabitility.getCenterFreqGranularity().getValue().decimalValue();
             }
         }
         return GridConstant.SLOT_WIDTH_50;