X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2FPcePathDescription.java;h=d0ae6968174cff6cc9470393fecd90b896e43d1d;hb=bae3a804f39421d6206357d3e771f4089368ead0;hp=2f887aa9855caf80ace2e097c68fec1ced884ae3;hpb=f5a8fe61d265bce36b2fca393d82685a22ac326a;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 2f887aa98..d0ae69681 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java @@ -8,27 +8,34 @@ package org.opendaylight.transportpce.pce; import com.google.common.collect.ImmutableList; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import org.opendaylight.transportpce.common.ResponseCodes; +import org.opendaylight.transportpce.common.StringConstants; +import org.opendaylight.transportpce.common.fixedflex.GridConstant; import org.opendaylight.transportpce.pce.networkanalyzer.PceLink; import org.opendaylight.transportpce.pce.networkanalyzer.PceResult; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.AToZDirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ZToADirectionBuilder; -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.path.description.atoz.direction.AToZBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.atoz.direction.AToZKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ztoa.direction.ZToA; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ztoa.direction.ZToABuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ztoa.direction.ZToAKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.Resource; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.ResourceBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.resource.LinkBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.resource.NodeBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.resource.TerminationPoint; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.resource.TerminationPointBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyTHz; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.ModulationFormat; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.OpucnTribSlotDef; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirectionBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirectionBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZ; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToA; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToABuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToAKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.Resource; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.ResourceBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.LinkBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.NodeBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPoint; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPointBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +44,6 @@ public class PcePathDescription { private static final Logger LOG = LoggerFactory.getLogger(PcePathDescription.class); private List pathAtoZ = null; - private List pathZtoA = null; private PceResult rc; private Map allPceLinks = null; @@ -50,49 +56,118 @@ public class PcePathDescription { public PceResult buildDescriptions() { LOG.info("In buildDescriptions: AtoZ = {}", pathAtoZ); - List atozList = new ArrayList<>(); + Map atozMap = new HashMap<>(); if (pathAtoZ == null) { rc.setRC(ResponseCodes.RESPONSE_FAILED); LOG.error("In buildDescriptions: there is empty AtoZ path"); return rc; } - buildAtoZ(atozList, pathAtoZ); - AToZDirectionBuilder atoZDirectionBldr = new AToZDirectionBuilder() - .setRate(rc.getRate()) - .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(); + buildAtoZ(atozMap, pathAtoZ); + rc.setAtoZDirection(buildAtoZDirection(atozMap).build()); + List pathZtoA = ImmutableList.copyOf(pathAtoZ).reverse(); LOG.info("In buildDescriptions: ZtoA {}", pathZtoA); - List ztoaList = new ArrayList<>(); + Map ztoaMap = new HashMap<>(); if (pathZtoA == null) { rc.setRC(ResponseCodes.RESPONSE_FAILED); LOG.error("In buildDescriptions: there is empty ZtoA path"); return rc; } - buildZtoA(ztoaList, pathZtoA); - ZToADirectionBuilder ztoADirectionBldr = new ZToADirectionBuilder() - .setRate(rc.getRate()) - .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()); + buildZtoA(ztoaMap, pathZtoA); + rc.setZtoADirection(buildZtoADirection(ztoaMap).build()); return rc; } - private void buildAtoZ(List etoeList, List path) { + /** + * Create a builder for AtoZDirection object. + * @param atozMap Map of AToZ object + * @return a builder for AtoZDirection object + */ + private AToZDirectionBuilder buildAtoZDirection(Map atozMap) { + AToZDirectionBuilder atoZDirectionBldr = new AToZDirectionBuilder() + .setRate(Uint32.valueOf(rc.getRate())) + .setModulationFormat(GridConstant.RATE_MODULATION_FORMAT_MAP + .getOrDefault(Uint32.valueOf(rc.getRate()), ModulationFormat.DpQpsk).getName()) + .setAToZ(atozMap); + switch (rc.getServiceType()) { + case StringConstants.SERVICE_TYPE_400GE: + case StringConstants.SERVICE_TYPE_OTUC4: + case StringConstants.SERVICE_TYPE_100GE_T: + case StringConstants.SERVICE_TYPE_OTU4: + atoZDirectionBldr.setAToZMaxFrequency(new FrequencyTHz(rc.getMaxFreq())); + atoZDirectionBldr.setAToZMinFrequency(new FrequencyTHz(rc.getMinFreq())); + atoZDirectionBldr.setAToZWavelengthNumber(Uint32.valueOf(rc.getResultWavelength())); + break; + case StringConstants.SERVICE_TYPE_100GE_M: + case StringConstants.SERVICE_TYPE_100GE_S: + case StringConstants.SERVICE_TYPE_10GE: + case StringConstants.SERVICE_TYPE_1GE: + case StringConstants.SERVICE_TYPE_ODU4: + case StringConstants.SERVICE_TYPE_ODUC4: + if (rc.getResultTribPortTribSlot().get(0) != null && rc.getResultTribPortTribSlot().get(1) != null) { + atoZDirectionBldr.setAToZWavelengthNumber(Uint32.valueOf(0)) + .setMinTribSlot(rc.getResultTribPortTribSlot().get(0)) + .setMaxTribSlot(rc.getResultTribPortTribSlot().get(1)); + } else { + LOG.error("Trib port and trib slot number should be present"); + atoZDirectionBldr.setMinTribSlot(new OpucnTribSlotDef("0.0")) + .setMaxTribSlot(new OpucnTribSlotDef("0.0")); + } + break; + default: + LOG.warn("unknown service type : unable to set Min/Max frequencies"); + break; + } + return atoZDirectionBldr; + } + + /** + * Create a builder for ZtoADirection object. + * @param ztoaMap Map of ZToA object + * @return a builder for ZtoADirection object + */ + private ZToADirectionBuilder buildZtoADirection(Map ztoaMap) { + ZToADirectionBuilder ztoADirectionBldr = new ZToADirectionBuilder().setRate(Uint32.valueOf(rc.getRate())) + .setModulationFormat(GridConstant.RATE_MODULATION_FORMAT_MAP + .getOrDefault(Uint32.valueOf(rc.getRate()), ModulationFormat.DpQpsk).getName()) + .setZToA(ztoaMap); + switch (rc.getServiceType()) { + case StringConstants.SERVICE_TYPE_400GE: + case StringConstants.SERVICE_TYPE_OTUC4: + case StringConstants.SERVICE_TYPE_100GE_T: + case StringConstants.SERVICE_TYPE_OTU4: + ztoADirectionBldr.setZToAMaxFrequency(new FrequencyTHz(rc.getMaxFreq())); + ztoADirectionBldr.setZToAMinFrequency(new FrequencyTHz(rc.getMinFreq())); + ztoADirectionBldr.setZToAWavelengthNumber(Uint32.valueOf(rc.getResultWavelength())); + break; + case StringConstants.SERVICE_TYPE_100GE_M: + case StringConstants.SERVICE_TYPE_100GE_S: + case StringConstants.SERVICE_TYPE_10GE: + case StringConstants.SERVICE_TYPE_1GE: + case StringConstants.SERVICE_TYPE_ODU4: + if (rc.getResultTribPortTribSlot().get(0) != null && rc.getResultTribPortTribSlot().get(1) != null) { + ztoADirectionBldr.setZToAWavelengthNumber(Uint32.valueOf(0)) + .setMinTribSlot(rc.getResultTribPortTribSlot().get(0)) + .setMaxTribSlot(rc.getResultTribPortTribSlot().get(1)); + } else { + LOG.error("Trib port and trib slot number should be present"); + ztoADirectionBldr.setMinTribSlot(new OpucnTribSlotDef("0.0")) + .setMaxTribSlot(new OpucnTribSlotDef("0.0")); + } + break; + default: + LOG.warn("unknown service type : unable to set Min/Max frequencies"); + break; + } + return ztoADirectionBldr; + } + + @SuppressWarnings("java:S138") + //sonar issue This method has 77 lines, which is greater than the 75 lines authorized. Split it into smaller + //ignore as it's not relevant to split it from functional point + private void buildAtoZ(Map atozMap, List path) { Integer index = 0; PceLink lastLink = null; AToZ lastResource = null; @@ -105,80 +180,82 @@ public class PcePathDescription { .build(); AToZKey clientKey = new AToZKey(index.toString()); - Resource clientResource = new ResourceBuilder().setResource(stp).build(); + Resource clientResource = new ResourceBuilder().setResource(stp).setState(State.InService).build(); AToZ firstResource = new AToZBuilder().setId(tpName).withKey(clientKey).setResource(clientResource).build(); - etoeList.add(firstResource); + atozMap.put(firstResource.key(),firstResource); index += 1; for (PceLink pcelink : path) { String srcName = pcelink.getSourceId().getValue(); // Nodes - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce + org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce .resource.resource.resource.Node sourceNode = new NodeBuilder() .setNodeId(srcName) .build(); // Source Resource AToZKey sourceKey = new AToZKey(index.toString()); - Resource nodeResource1 = new ResourceBuilder().setResource(sourceNode).build(); + Resource nodeResource1 = new ResourceBuilder().setResource(sourceNode).setState(State.InService).build(); AToZ srcResource = new AToZBuilder().setId(srcName).withKey(sourceKey).setResource(nodeResource1).build(); index += 1; - etoeList.add(srcResource); + atozMap.put(srcResource.key(),srcResource); // source TP - tpName = pcelink.getSourceTP().toString(); + tpName = pcelink.getSourceTP().getValue(); stp = new TerminationPointBuilder() .setTpNodeId(srcName).setTpId(tpName) .build(); // Resource AToZKey srcTPKey = new AToZKey(index.toString()); - Resource tpResource1 = new ResourceBuilder().setResource(stp).build(); + Resource tpResource1 = new ResourceBuilder().setResource(stp).setState(State.InService).build(); AToZ stpResource = new AToZBuilder().setId(tpName).withKey(srcTPKey).setResource(tpResource1).build(); index += 1; - etoeList.add(stpResource); + atozMap.put(stpResource.key(),stpResource); String linkName = pcelink.getLinkId().getValue(); // Link - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce + org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce .resource.resource.resource.Link atozLink = new LinkBuilder() .setLinkId(linkName) .build(); // Link Resource AToZKey linkKey = new AToZKey(index.toString()); - Resource nodeResource2 = new ResourceBuilder().setResource(atozLink).build(); + Resource nodeResource2 = new ResourceBuilder().setResource(atozLink).setState(pcelink.getState()).build(); AToZ linkResource = new AToZBuilder().setId(linkName).withKey(linkKey).setResource(nodeResource2).build(); index += 1; - etoeList.add(linkResource); + atozMap.put(linkResource.key(),linkResource); String destName = pcelink.getDestId().getValue(); // target TP - tpName = pcelink.getDestTP().toString(); + tpName = pcelink.getDestTP().getValue(); TerminationPoint dtp = new TerminationPointBuilder() .setTpNodeId(destName).setTpId(tpName) .build(); // Resource AToZKey destTPKey = new AToZKey(index.toString()); - Resource tpResource2 = new ResourceBuilder().setResource(dtp).build(); + Resource tpResource2 = new ResourceBuilder().setResource(dtp).setState(State.InService).build(); AToZ ttpResource = new AToZBuilder().setId(tpName).withKey(destTPKey).setResource(tpResource2).build(); index += 1; - etoeList.add(ttpResource); + atozMap.put(ttpResource.key(),ttpResource); - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce + org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce .resource.resource.resource.Node targetNode = new NodeBuilder() .setNodeId(destName) .build(); // Target Resource AToZKey targetKey = new AToZKey(index.toString()); - Resource nodeResource3 = new ResourceBuilder().setResource(targetNode).build(); + Resource nodeResource3 = new ResourceBuilder().setResource(targetNode).setState(State.InService).build(); lastResource = new AToZBuilder().setId(destName).withKey(targetKey).setResource(nodeResource3).build(); lastLink = pcelink; } - etoeList.add(lastResource); + if (lastResource != null) { + atozMap.put(lastResource.key(),lastResource); + } // build Z side Client TP tpName = lastLink.getClient(); @@ -189,13 +266,13 @@ public class PcePathDescription { index += 1; clientKey = new AToZKey(index.toString()); - clientResource = new ResourceBuilder().setResource(stp).build(); + clientResource = new ResourceBuilder().setResource(stp).setState(State.InService).build(); lastResource = new AToZBuilder().setId(tpName).withKey(clientKey).setResource(clientResource).build(); - etoeList.add(lastResource); + atozMap.put(lastResource.key(),lastResource); } - private void buildZtoA(List etoelist, List path) { + private void buildZtoA(Map ztoaList, List path) { Integer index = 0; PceLink lastLink = null; ZToA lastResource = null; @@ -209,9 +286,9 @@ public class PcePathDescription { .build(); ZToAKey clientKey = new ZToAKey(index.toString()); - Resource clientResource = new ResourceBuilder().setResource(stp).build(); + Resource clientResource = new ResourceBuilder().setResource(stp).setState(State.InService).build(); ZToA firstResource = new ZToABuilder().setId(tpName).withKey(clientKey).setResource(clientResource).build(); - etoelist.add(firstResource); + ztoaList.put(firstResource.key(),firstResource); index += 1; for (PceLink pcelinkAtoZ : path) { @@ -223,69 +300,71 @@ public class PcePathDescription { // Nodes - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce + org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce .resource.resource.resource.Node sourceNode = new NodeBuilder() .setNodeId(srcName).build(); // Source Resource ZToAKey sourceKey = new ZToAKey(index.toString()); - Resource nodeResource1 = new ResourceBuilder().setResource(sourceNode).build(); + Resource nodeResource1 = new ResourceBuilder().setResource(sourceNode).setState(State.InService).build(); ZToA srcResource = new ZToABuilder().setId(srcName).withKey(sourceKey).setResource(nodeResource1).build(); index += 1; - etoelist.add(srcResource); + ztoaList.put(srcResource.key(),srcResource); // source TP - tpName = pcelink.getSourceTP().toString(); + tpName = pcelink.getSourceTP().getValue(); stp = new TerminationPointBuilder() .setTpNodeId(srcName).setTpId(tpName) .build(); // Resource ZToAKey srcTPKey = new ZToAKey(index.toString()); - Resource tpResource1 = new ResourceBuilder().setResource(stp).build(); + Resource tpResource1 = new ResourceBuilder().setResource(stp).setState(State.InService).build(); ZToA stpResource = new ZToABuilder().setId(tpName).withKey(srcTPKey).setResource(tpResource1).build(); index += 1; - etoelist.add(stpResource); + ztoaList.put(stpResource.key(),stpResource); String linkName = pcelink.getLinkId().getValue(); // Link - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce + org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce .resource.resource.resource.Link ztoaLink = new LinkBuilder() .setLinkId(linkName).build(); // Link Resource ZToAKey linkKey = new ZToAKey(index.toString()); - Resource nodeResource2 = new ResourceBuilder().setResource(ztoaLink).build(); + Resource nodeResource2 = new ResourceBuilder().setResource(ztoaLink).setState(State.InService).build(); ZToA linkResource = new ZToABuilder().setId(linkName).withKey(linkKey).setResource(nodeResource2).build(); index += 1; - etoelist.add(linkResource); + ztoaList.put(linkResource.key(),linkResource); String destName = pcelink.getDestId().getValue(); // target TP - tpName = pcelink.getDestTP().toString(); + tpName = pcelink.getDestTP().getValue(); TerminationPoint ttp = new TerminationPointBuilder() .setTpNodeId(destName).setTpId(tpName).build(); // Resource ZToAKey destTPKey = new ZToAKey(index.toString()); - Resource tpResource2 = new ResourceBuilder().setResource(ttp).build(); + Resource tpResource2 = new ResourceBuilder().setResource(ttp).setState(State.InService).build(); ZToA ttpResource = new ZToABuilder().setId(tpName).withKey(destTPKey).setResource(tpResource2).build(); index += 1; - etoelist.add(ttpResource); + ztoaList.put(ttpResource.key(),ttpResource); - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce + org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce .resource.resource.resource.Node targetNode = new NodeBuilder() .setNodeId(destName).build(); // Target Resource ZToAKey targetKey = new ZToAKey(index.toString()); - Resource nodeResource3 = new ResourceBuilder().setResource(targetNode).build(); + Resource nodeResource3 = new ResourceBuilder().setResource(targetNode).setState(State.InService).build(); lastResource = new ZToABuilder().setId(destName).withKey(targetKey).setResource(nodeResource3).build(); lastLink = pcelink; } - etoelist.add(lastResource); + if (lastResource != null) { + ztoaList.put(lastResource.key(),lastResource); + } // build Z side Client TP tpName = lastLink.getClient(); @@ -295,9 +374,9 @@ public class PcePathDescription { index += 1; clientKey = new ZToAKey(index.toString()); - clientResource = new ResourceBuilder().setResource(stp).build(); + clientResource = new ResourceBuilder().setResource(stp).setState(State.InService).build(); lastResource = new ZToABuilder().setId(tpName).withKey(clientKey).setResource(clientResource).build(); - etoelist.add(lastResource); + ztoaList.put(lastResource.key(),lastResource); } public PceResult getReturnStructure() {