X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fgraph%2FPceGraph.java;fp=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fgraph%2FPceGraph.java;h=994d3256fcbdce825275437c91d2357e60b176f2;hp=b5d77ac89a51f75c7faaa23e9a7812abfb8f2208;hb=70bdf049cd030b154968d56a42bca8d26447ffc6;hpb=6ae7f17afc50195ff2449043e65341e28c1056e3 diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java index b5d77ac89..994d3256f 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java @@ -9,6 +9,7 @@ package org.opendaylight.transportpce.pce.graph; import java.util.ArrayList; +import java.util.BitSet; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -54,6 +55,7 @@ public class PceGraph { private Double margin = null; PceConstraints pceHardConstraints; private PceConstraintMode pceConstraintMode; + private BitSet spectrumConstraint; // results private PceResult pceResult = null; @@ -68,7 +70,7 @@ public class PceGraph { public PceGraph(PceNode aendNode, PceNode zendNode, Map allPceNodes, Map allPceLinks, PceConstraints pceHardConstraints,PceResult pceResult, String serviceType, - NetworkTransactionService networkTransactionService, PceConstraintMode mode) { + NetworkTransactionService networkTransactionService, PceConstraintMode mode, BitSet spectrumConstraint) { super(); this.apceNode = aendNode; this.zpceNode = zendNode; @@ -79,6 +81,7 @@ public class PceGraph { this.serviceType = serviceType; this.networkTransactionService = networkTransactionService; this.pceConstraintMode = mode; + this.spectrumConstraint = spectrumConstraint; LOG.info("In GraphCalculator: A and Z = {} / {} ", aendNode, zendNode); LOG.debug("In GraphCalculator: allPceNodes size {}, nodes {} ", allPceNodes.size(), allPceNodes); @@ -102,7 +105,7 @@ public class PceGraph { for (Entry> entry : allWPaths.entrySet()) { GraphPath path = entry.getValue(); LOG.info("validating path n° {} - {}", entry.getKey(), path.getVertexList()); - PostAlgoPathValidator papv = new PostAlgoPathValidator(networkTransactionService); + PostAlgoPathValidator papv = new PostAlgoPathValidator(networkTransactionService, spectrumConstraint); pceResult = papv.checkPath( path, allPceNodes, allPceLinks, pceResult, pceHardConstraints, serviceType, pceConstraintMode); this.margin = papv.getTpceCalculatedMargin();