X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2FPcePathDescription.java;h=bb29feb6d4f49f9b474aa18c492af47f74f49943;hb=62fc6625966276207a38955eaf07988f77f6984f;hp=842529a5251fbccb31e68cd8a34d8f921ff64044;hpb=aafa2ea596dc9ea93b5ce5a7156ae68acf4b403f;p=transportpce.git diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java index 842529a52..bb29feb6d 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java @@ -55,7 +55,7 @@ public class PcePathDescription { } public PceResult buildDescriptions() { - LOG.info("In buildDescriptions: AtoZ {}", pathAtoZ.toString()); + LOG.info("In buildDescriptions: AtoZ = {}", pathAtoZ.toString()); List atozList = new ArrayList(); if (pathAtoZ == null) { rc.setRC(ResponseCodes.RESPONSE_FAILED); @@ -64,12 +64,16 @@ public class PcePathDescription { } buildAtoZ(atozList, pathAtoZ); - - rc.setAtoZDirection(new AToZDirectionBuilder() + AToZDirectionBuilder atoZDirectionBldr = new AToZDirectionBuilder() .setRate(rc.getRate()) - .setAToZWavelengthNumber(rc.getResultWavelength()) - .setAToZ(atozList).build()); - + .setAToZ(atozList); + if ("100GE".equals(rc.getServiceType()) || "OTU4".equals(rc.getServiceType())) { + atoZDirectionBldr.setAToZWavelengthNumber(rc.getResultWavelength()); + } else if ("10GE".equals(rc.getServiceType()) || "1GE".equals(rc.getServiceType()) + || "ODU4".equals(rc.getServiceType())) { + atoZDirectionBldr.setAToZWavelengthNumber(Long.valueOf(0)); + } + rc.setAtoZDirection(atoZDirectionBldr.build()); pathZtoA = ImmutableList.copyOf(pathAtoZ).reverse(); LOG.info("In buildDescriptions: ZtoA {}", pathZtoA.toString()); @@ -80,17 +84,21 @@ public class PcePathDescription { return rc; } buildZtoA(ztoaList, pathZtoA); - - rc.setZtoADirection(new ZToADirectionBuilder() + ZToADirectionBuilder ztoADirectionBldr = new ZToADirectionBuilder() .setRate(rc.getRate()) - .setZToAWavelengthNumber(rc.getResultWavelength()) - .setZToA(ztoaList).build()); + .setZToA(ztoaList); + if ("100GE".equals(rc.getServiceType()) || "OTU4".equals(rc.getServiceType())) { + ztoADirectionBldr.setZToAWavelengthNumber(rc.getResultWavelength()); + } else if ("10GE".equals(rc.getServiceType()) || "1GE".equals(rc.getServiceType()) + || "ODU4".equals(rc.getServiceType())) { + ztoADirectionBldr.setZToAWavelengthNumber(Long.valueOf(0)); + } + rc.setZtoADirection(ztoADirectionBldr.build()); return rc; } private void buildAtoZ(List etoeList, List path) { - Integer index = 0; PceLink lastLink = null; AToZ lastResource = null;