X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fgraph%2FPceGraph.java;h=b29e4dbce8103d3af71e4f4204941659f7598ead;hb=7e175bf72bc28db4299b1fd76e6d01bdb0854d0f;hp=b3dbae014e250d1bfaac3baea45cc046e5487a62;hpb=7ea354677f9b8ee0b160a7b636c51bb0bedfcd7b;p=transportpce.git 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 b3dbae014..b29e4dbce 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 @@ -13,12 +13,12 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.jgrapht.GraphPath; import org.jgrapht.alg.shortestpath.KShortestSimplePaths; import org.jgrapht.alg.shortestpath.PathValidator; import org.jgrapht.graph.DefaultDirectedWeightedGraph; import org.opendaylight.transportpce.common.ResponseCodes; +import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.transportpce.pce.networkanalyzer.PceLink; import org.opendaylight.transportpce.pce.networkanalyzer.PceNode; @@ -107,9 +107,12 @@ public class PceGraph { } shortestPathAtoZ = new ArrayList<>(pathAtoZ); - if (("100GE".equals(serviceType)) || ("OTU4".equals(serviceType))) { - LOG.info("In calcPath Path FOUND path for wl [{}], hops {}, distance per metrics {}, path AtoZ {}", - pceResult.getResultWavelength(), pathAtoZ.size(), path.getWeight(), pathAtoZ); + if ((StringConstants.SERVICE_TYPE_100GE.equals(serviceType)) + || (StringConstants.SERVICE_TYPE_OTU4.equals(serviceType))) { + LOG.info("In calcPath Path FOUND path for wl [{}], min Freq assignment {}, max Freq assignment {}," + + " hops {}, distance per metrics {}, path AtoZ {}", + pceResult.getResultWavelength(), pceResult.getMinFreq(), pceResult.getMaxFreq(), + pathAtoZ.size(), path.getWeight(), pathAtoZ); break; } else { // Service is at OTN layer and is relying on a supporting wavelength service @@ -121,8 +124,9 @@ public class PceGraph { } if (shortestPathAtoZ != null) { - LOG.info("In calcPath CHOOSEN PATH for wl [{}], hops {}, path AtoZ {}", - pceResult.getResultWavelength(), shortestPathAtoZ.size(), shortestPathAtoZ); + LOG.info("In calcPath CHOOSEN PATH for wl [{}], min freq {}, max freq {}, hops {}, path AtoZ {}", + pceResult.getResultWavelength(), pceResult.getMinFreq(), pceResult.getMaxFreq(), + shortestPathAtoZ.size(), shortestPathAtoZ); } LOG.info("In calcPath : pceResult {}", pceResult); return (pceResult.getStatus());