X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceCalculation.java;h=81cc58b52f5bb57ca14544be5798304e1dd43e61;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=0ec90b7c81b2c609c711a2c199b711e79ee15a99;hpb=62fc6625966276207a38955eaf07988f77f6984f;p=transportpce.git 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 0ec90b7c8..81cc58b52 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java @@ -8,26 +8,33 @@ package org.opendaylight.transportpce.pce.networkanalyzer; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; 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; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.ResponseCodes; +import org.opendaylight.transportpce.common.StringConstants; +import org.opendaylight.transportpce.common.fixedflex.GridConstant; +import org.opendaylight.transportpce.common.mapping.MappingUtils; +import org.opendaylight.transportpce.common.mapping.MappingUtilsImpl; +import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.pce.constraints.PceConstraints; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mc.capabilities.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; @@ -38,7 +45,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -//import org.opendaylight.yangtools.yang.common.Decimal64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,9 +65,9 @@ public class PceCalculation { private PceConstraints pceHardConstraints; ///////////// Intermediate data///////////////// - private List addLinks = new ArrayList(); - private List dropLinks = new ArrayList(); - private HashSet azSrgs = new HashSet(); + private List addLinks = new ArrayList<>(); + private List dropLinks = new ArrayList<>(); + private HashSet azSrgs = new HashSet<>(); private PceNode aendPceNode = null; private PceNode zendPceNode = null; @@ -70,24 +76,30 @@ public class PceCalculation { private List allNodes = null; // this List serves graph calculation - private Map allPceNodes = new HashMap(); + private Map allPceNodes = new HashMap<>(); // this List serves calculation of ZtoA path description // TODO maybe better solution is possible - private Map allPceLinks = new HashMap(); - private Set linksToExclude = new HashSet(); + private Map allPceLinks = new HashMap<>(); + private Set linksToExclude = new HashSet<>(); private PceResult returnStructure; + private PortMapping portMapping; private enum ConstraintTypes { NONE, HARD_EXCLUDE, HARD_INCLUDE, HARD_DIVERSITY, SOFT_EXCLUDE, SOFT_INCLUDE, SOFT_DIVERSITY; } + private MappingUtils mappingUtils; + public PceCalculation(PathComputationRequestInput input, NetworkTransactionService networkTransactionService, - PceConstraints pceHardConstraints, PceConstraints pceSoftConstraints, PceResult rc) { + PceConstraints pceHardConstraints, PceConstraints pceSoftConstraints, PceResult rc, + PortMapping portMapping) { this.input = input; this.networkTransactionService = networkTransactionService; this.returnStructure = rc; this.pceHardConstraints = pceHardConstraints; + this.mappingUtils = new MappingUtilsImpl(networkTransactionService.getDataBroker()); + this.portMapping = portMapping; parseInput(); } @@ -112,8 +124,6 @@ public class PceCalculation { } private boolean parseInput() { - anodeId = input.getServiceAEnd().getNodeId(); - znodeId = input.getServiceZEnd().getNodeId(); if (input.getServiceAEnd().getServiceFormat() == null || input.getServiceZEnd().getServiceFormat() == null || input.getServiceAEnd().getServiceRate() == null) { LOG.error("Service Format and Service Rate are required for a path calculation"); @@ -121,7 +131,7 @@ public class PceCalculation { } serviceFormatA = input.getServiceAEnd().getServiceFormat().getName(); serviceFormatZ = input.getServiceZEnd().getServiceFormat().getName(); - serviceRate = input.getServiceAEnd().getServiceRate(); + serviceRate = input.getServiceAEnd().getServiceRate().toJava(); LOG.info("parseInput: A and Z :[{}] and [{}]", anodeId, znodeId); if (!(serviceFormatA.equals(serviceFormatZ))) { @@ -130,13 +140,13 @@ public class PceCalculation { switch (serviceFormatA) { case "Ethernet": case "OC": - serviceType = "100GE"; + serviceType = StringConstants.SERVICE_TYPE_100GE; break; case "OTU": - serviceType = "OTU4"; + serviceType = StringConstants.SERVICE_TYPE_OTU4; break; case "ODU": - serviceType = "ODU4"; + serviceType = StringConstants.SERVICE_TYPE_ODU4; break; default: LOG.debug("parseInput: unsupported service type: Format {} Rate 100L", serviceFormatA); @@ -147,21 +157,32 @@ public class PceCalculation { //And casting to int bumps the limit here. //Passing by ENUM or String are possible alternatives. //Maybe HashMap and similar options should also be considered here. - } else if (serviceFormatA == "Ethernet") { + } else if ("Ethernet".equals(serviceFormatA)) { //only rate 100L is currently supported except in Ethernet - if (serviceRate == 10L) { - serviceType = "10GE"; + if (serviceRate == 400L) { + serviceType = StringConstants.SERVICE_TYPE_400GE; + } else if (serviceRate == 10L) { + serviceType = StringConstants.SERVICE_TYPE_10GE; } else if (serviceRate == 1L) { - serviceType = "1GE"; + serviceType = StringConstants.SERVICE_TYPE_1GE; } else { - LOG.debug("parseInput: unsupported service type: Format Ethernet Rate {}", String.valueOf(serviceRate)); + LOG.debug("parseInput: unsupported service type: Format Ethernet Rate {}", serviceRate); } } else { LOG.debug("parseInput: unsupported service type: Format {} Rate {}", - serviceFormatA, String.valueOf(serviceRate)); + serviceFormatA, serviceRate); + } + if (StringConstants.SERVICE_TYPE_ODU4.equals(serviceType) + || StringConstants.SERVICE_TYPE_10GE.equals(serviceType) + || StringConstants.SERVICE_TYPE_1GE.equals(serviceType)) { + anodeId = input.getServiceAEnd().getTxDirection().getPort().getPortDeviceName(); + znodeId = input.getServiceZEnd().getTxDirection().getPort().getPortDeviceName(); + } else { + anodeId = input.getServiceAEnd().getNodeId(); + znodeId = input.getServiceZEnd().getNodeId(); } - returnStructure.setRate(input.getServiceAEnd().getServiceRate()); + returnStructure.setRate(input.getServiceAEnd().getServiceRate().toJava()); returnStructure.setServiceFormat(input.getServiceAEnd().getServiceFormat()); return true; } @@ -169,14 +190,13 @@ public class PceCalculation { private boolean readMdSal() { InstanceIdentifier nwInstanceIdentifier = null; Network nw = null; - if (("OC".equals(serviceFormatA)) || ("OTU".equals(serviceFormatA)) || (("Ethernet".equals(serviceFormatA)) - && (serviceRate == 100L))) { - + if (("OC".equals(serviceFormatA)) || ("OTU".equals(serviceFormatA)) + || ("Ethernet".equals(serviceFormatA) && ((serviceRate == 100L) || (serviceRate == 400L)))) { LOG.info("readMdSal: network {}", NetworkUtils.OVERLAY_NETWORK_ID); nwInstanceIdentifier = InstanceIdentifier.builder(Networks.class) .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))).build(); - } else if ("ODU".equals(serviceFormatA) || ("Ethernet".equals(serviceFormatA) && serviceRate == 10L) - || ("Ethernet".equals(serviceFormatA) && serviceRate == 1L)) { + } else if ("ODU".equals(serviceFormatA) + || ("Ethernet".equals(serviceFormatA) && ((serviceRate == 10L) || (serviceRate == 1L)))) { LOG.info("readMdSal: network {}", NetworkUtils.OTN_NETWORK_ID); nwInstanceIdentifier = InstanceIdentifier.builder(Networks.class) .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OTN_NETWORK_ID))).build(); @@ -190,7 +210,7 @@ public class PceCalculation { networkTransactionService.read(LogicalDatastoreType.CONFIGURATION, nwInstanceIdentifier).get(); if (nwOptional.isPresent()) { nw = nwOptional.get(); - LOG.debug("readMdSal: network nodes: nwOptional.isPresent = true {}", nw.toString()); + LOG.debug("readMdSal: network nodes: nwOptional.isPresent = true {}", nw); } } catch (InterruptedException | ExecutionException e) { LOG.error("readMdSal: Error reading topology {}", nwInstanceIdentifier); @@ -205,12 +225,13 @@ public class PceCalculation { LOG.error("readMdSal: network is null: {}", nwInstanceIdentifier); return false; } - allNodes = nw.getNode().stream().sorted((n1, n2) -> n1.getNodeId().getValue().compareTo(n2.getNodeId() - .getValue())).collect(Collectors.toList()); + allNodes = nw.nonnullNode().values().stream().sorted((n1, n2) + -> n1.getNodeId().getValue().compareTo(n2.getNodeId().getValue())).collect(Collectors.toList()); Network1 nw1 = nw.augmentation(Network1.class); if (nw1 != null) { - allLinks = nw1.getLink().stream().sorted((l1, l2) -> l1.getSource().getSourceTp().toString().compareTo(l2 - .getSource().getSourceTp().toString())).collect(Collectors.toList()); + allLinks = nw1.nonnullLink().values().stream().sorted((l1, l2) + -> l1.getSource().getSourceTp().toString().compareTo(l2.getSource().getSourceTp().toString())) + .collect(Collectors.toList()); } else { LOG.warn("no otn links in otn-topology"); } @@ -219,14 +240,14 @@ public class PceCalculation { return false; } LOG.info("readMdSal: network nodes: {} nodes added", allNodes.size()); - LOG.debug("readMdSal: network nodes: {} nodes added", allNodes.toString()); + LOG.debug("readMdSal: network nodes: {} nodes added", allNodes); if (allLinks == null || allLinks.isEmpty()) { LOG.error("readMdSal: no links "); return false; } LOG.info("readMdSal: network links: {} links added", allLinks.size()); - LOG.debug("readMdSal: network links: {} links added", allLinks.toString()); + LOG.debug("readMdSal: network links: {} links added", allLinks); return true; } @@ -235,7 +256,9 @@ public class PceCalculation { LOG.debug("analyzeNw: allNodes size {}, allLinks size {}", allNodes.size(), allLinks.size()); - if (("100GE".equals(serviceType)) || ("OTU4".equals(serviceType))) { + if (StringConstants.SERVICE_TYPE_100GE.equals(serviceType) + || StringConstants.SERVICE_TYPE_OTU4.equals(serviceType) + || StringConstants.SERVICE_TYPE_400GE.equals(serviceType)) { // 100GE service and OTU4 service are handled at the openroadm-topology layer for (Node node : allNodes) { validateNode(node); @@ -272,7 +295,7 @@ public class PceCalculation { validateOtnNode(node); } - LOG.info("analyzeNw: allPceNodes {}", allPceNodes.toString()); + LOG.info("analyzeNw: allPceNodes {}", allPceNodes); if (aendPceNode == null || zendPceNode == null) { LOG.error("analyzeNw: Error in reading nodes: A or Z do not present in the network"); @@ -289,8 +312,8 @@ public class PceCalculation { return false; } - LOG.debug("analyzeNw: allPceNodes {}", allPceNodes.toString()); - LOG.debug("analyzeNw: allPceLinks {}", allPceLinks.toString()); + LOG.debug("analyzeNw: allPceNodes {}", allPceNodes); + LOG.debug("analyzeNw: allPceLinks {}", allPceLinks); return true; } @@ -302,7 +325,7 @@ public class PceCalculation { if (azSrgs.contains(nodeId)) { allPceLinks.put(pcelink.getLinkId(), pcelink); allPceNodes.get(nodeId).addOutgoingLink(pcelink); - LOG.debug("analyzeNw: Add_LINK added to source and to allPceLinks {}", pcelink.getLinkId().toString()); + LOG.debug("analyzeNw: Add_LINK added to source and to allPceLinks {}", pcelink.getLinkId()); return true; } @@ -320,7 +343,7 @@ public class PceCalculation { if (azSrgs.contains(nodeId)) { allPceLinks.put(pcelink.getLinkId(), pcelink); allPceNodes.get(nodeId).addOutgoingLink(pcelink); - LOG.debug("analyzeNw: Drop_LINK added to dest and to allPceLinks {}", pcelink.getLinkId().toString()); + LOG.debug("analyzeNw: Drop_LINK added to dest and to allPceLinks {}", pcelink.getLinkId()); return true; } @@ -332,12 +355,13 @@ public class PceCalculation { } private boolean validateLink(Link link) { - LOG.info("validateLink: link {} ", link.toString()); + LOG.info("validateLink: link {} ", link); NodeId sourceId = link.getSource().getSourceNode(); NodeId destId = link.getDestination().getDestNode(); PceNode source = allPceNodes.get(sourceId); PceNode dest = allPceNodes.get(destId); + State state = link.augmentation(Link1.class).getOperationalState(); if (source == null) { LOG.debug("validateLink: Link is ignored due source node is rejected by node validation - {}", @@ -350,8 +374,16 @@ public class PceCalculation { return false; } - if (("100GE".equals(serviceType)) || ("OTU4".equals(serviceType))) { - // 100GE or OTU4 services are handled at WDM Layer + if (State.OutOfService.equals(state)) { + LOG.debug("validateLink: Link is ignored due operational state - {}", + state.getName()); + return false; + } + + if (StringConstants.SERVICE_TYPE_100GE.equals(serviceType) + || StringConstants.SERVICE_TYPE_OTU4.equals(serviceType) + || StringConstants.SERVICE_TYPE_400GE.equals(serviceType)) { + // 100GE or 400GE or OTU4 services are handled at WDM Layer PceLink pcelink = new PceLink(link, source, dest); if (!pcelink.isValid()) { dropOppositeLink(link); @@ -359,13 +391,10 @@ public class PceCalculation { return false; } LinkId linkId = pcelink.getLinkId(); - switch (validateLinkConstraints(pcelink)) { - case HARD_EXCLUDE: - dropOppositeLink(link); - LOG.debug("validateLink: constraints : link is ignored == {}", linkId.getValue()); - return false; - default: - break; + if (validateLinkConstraints(pcelink).equals(ConstraintTypes.HARD_EXCLUDE)) { + dropOppositeLink(link); + LOG.debug("validateLink: constraints : link is ignored == {}", linkId.getValue()); + return false; } switch (pcelink.getlinkType()) { case ROADMTOROADM: @@ -373,17 +402,17 @@ public class PceCalculation { allPceLinks.put(linkId, pcelink); source.addOutgoingLink(pcelink); LOG.debug("validateLink: {}-LINK added to allPceLinks {}", - pcelink.getlinkType(), pcelink.toString()); + pcelink.getlinkType(), pcelink); break; case ADDLINK: pcelink.setClient(source.getRdmSrgClient(pcelink.getSourceTP().toString())); addLinks.add(pcelink); - LOG.debug("validateLink: ADD-LINK saved {}", pcelink.toString()); + LOG.debug("validateLink: ADD-LINK saved {}", pcelink); break; case DROPLINK: pcelink.setClient(dest.getRdmSrgClient(pcelink.getDestTP().toString())); dropLinks.add(pcelink); - LOG.debug("validateLink: DROP-LINK saved {}", pcelink.toString()); + LOG.debug("validateLink: DROP-LINK saved {}", pcelink); break; case XPONDERINPUT: // store separately all SRG links directly @@ -391,7 +420,7 @@ public class PceCalculation { // connected to A/Z if (!dest.checkTP(pcelink.getDestTP().toString())) { LOG.debug( - "validateLink: XPONDER-INPUT is rejected as NW port is busy - {} ", pcelink.toString()); + "validateLink: XPONDER-INPUT is rejected as NW port is busy - {} ", pcelink); return false; } if (dest.getXpdrClient(pcelink.getDestTP().toString()) != null) { @@ -399,7 +428,7 @@ public class PceCalculation { } allPceLinks.put(linkId, pcelink); source.addOutgoingLink(pcelink); - LOG.debug("validateLink: XPONDER-INPUT link added to allPceLinks {}", pcelink.toString()); + LOG.debug("validateLink: XPONDER-INPUT link added to allPceLinks {}", pcelink); break; // does it mean XPONDER==>>SRG ? case XPONDEROUTPUT: @@ -408,7 +437,7 @@ public class PceCalculation { // connected to A/Z if (!source.checkTP(pcelink.getSourceTP().toString())) { LOG.debug( - "validateLink: XPONDER-OUTPUT is rejected as NW port is busy - {} ", pcelink.toString()); + "validateLink: XPONDER-OUTPUT is rejected as NW port is busy - {} ", pcelink); return false; } if (source.getXpdrClient(pcelink.getSourceTP().toString()) != null) { @@ -416,14 +445,16 @@ public class PceCalculation { } allPceLinks.put(linkId, pcelink); source.addOutgoingLink(pcelink); - LOG.debug("validateLink: XPONDER-OUTPUT link added to allPceLinks {}", pcelink.toString()); + LOG.debug("validateLink: XPONDER-OUTPUT link added to allPceLinks {}", pcelink); break; default: - LOG.warn("validateLink: link type is not supported {}", pcelink.toString()); + LOG.warn("validateLink: link type is not supported {}", pcelink); } return true; - } else if (("ODU4".equals(serviceType)) || ("10GE".equals(serviceType)) || ("1GE".equals(serviceType))) { + } else if ((StringConstants.SERVICE_TYPE_ODU4.equals(serviceType)) + || (StringConstants.SERVICE_TYPE_10GE.equals(serviceType)) + || (StringConstants.SERVICE_TYPE_1GE.equals(serviceType))) { // ODU4, 1GE and 10GE services relying on ODU2, ODU2e or ODU0 services are handled at OTN layer PceLink pceOtnLink = new PceLink(link, source, dest); @@ -434,14 +465,12 @@ public class PceCalculation { } LinkId linkId = pceOtnLink.getLinkId(); - switch (validateLinkConstraints(pceOtnLink)) { - case HARD_EXCLUDE: - dropOppositeLink(link); - LOG.debug("validateLink: constraints : link is ignored == {}", linkId.getValue()); - return false; - default: - break; + if (validateLinkConstraints(pceOtnLink).equals(ConstraintTypes.HARD_EXCLUDE)) { + dropOppositeLink(link); + LOG.debug("validateLink: constraints : link is ignored == {}", linkId.getValue()); + return false; } + switch (pceOtnLink.getlinkType()) { case OTNLINK: if (dest.getXpdrClient(pceOtnLink.getDestTP().toString()) != null) { @@ -450,10 +479,10 @@ public class PceCalculation { allPceLinks.put(linkId, pceOtnLink); source.addOutgoingLink(pceOtnLink); - LOG.info("validateLink: OTN-LINK added to allPceLinks {}", pceOtnLink.toString()); + LOG.info("validateLink: OTN-LINK added to allPceLinks {}", pceOtnLink); break; default: - LOG.warn("validateLink: link type is not supported {}", pceOtnLink.toString()); + LOG.warn("validateLink: link type is not supported {}", pceOtnLink); } return true; @@ -464,49 +493,79 @@ public class PceCalculation { } - private boolean validateNode(Node node) { - LOG.debug("validateNode: node {} ", node.toString()); - + private void validateNode(Node node) { + LOG.debug("validateNode: node {} ", node); // PceNode will be used in Graph algorithm Node1 node1 = node.augmentation(Node1.class); if (node1 == null) { LOG.error("getNodeType: no Node1 (type) Augmentation for node: [{}]. Node is ignored", node.getNodeId()); + return; + } + if (State.OutOfService.equals(node1.getOperationalState())) { + LOG.error("getNodeType: node is ignored due to operational state - {}", node1.getOperationalState() + .getName()); + return; } OpenroadmNodeType nodeType = node1.getNodeType(); + String deviceNodeId = MapUtils.getSupNetworkNode(node); + // Should never happen but because of existing topology test files + // we have to manage this case + if (deviceNodeId == null || deviceNodeId.isBlank()) { + deviceNodeId = node.getNodeId().getValue(); + } - PceOpticalNode pceNode = new PceOpticalNode(node, nodeType, node.getNodeId(), - input.getServiceAEnd().getServiceFormat(), "optical"); - pceNode.validateAZxponder(anodeId, znodeId); - pceNode.initWLlist(); + LOG.info("Device node id {} for {}", deviceNodeId, node); + PceOpticalNode pceNode = new PceOpticalNode(deviceNodeId, this.serviceType, portMapping, node, nodeType, + mappingUtils.getOpenRoadmVersion(deviceNodeId), getSlotWidthGranularity(deviceNodeId, node.getNodeId())); + pceNode.validateAZxponder(anodeId, znodeId, input.getServiceAEnd().getServiceFormat()); + pceNode.initFrequenciesBitSet(); if (!pceNode.isValid()) { LOG.warn(" validateNode: Node is ignored"); - return false; + return; } - - switch (validateNodeConstraints(pceNode)) { - case HARD_EXCLUDE: - return false; - - default: - break; + if (validateNodeConstraints(pceNode).equals(ConstraintTypes.HARD_EXCLUDE)) { + return; } - if ((pceNode.getSupNetworkNodeId().equals(anodeId) && (this.aendPceNode == null)) - && (endPceNode(nodeType, pceNode.getNodeId(), pceNode))) { + if (endPceNode(nodeType, pceNode.getNodeId(), pceNode) && this.aendPceNode == null + && isAZendPceNode(this.serviceFormatA, pceNode, anodeId, "A")) { this.aendPceNode = pceNode; } - if ((pceNode.getSupNetworkNodeId().equals(znodeId) && (this.zendPceNode == null)) - && (endPceNode(nodeType, pceNode.getNodeId(), pceNode))) { + if (endPceNode(nodeType, pceNode.getNodeId(), pceNode) && this.zendPceNode == null + && isAZendPceNode(this.serviceFormatZ, pceNode, znodeId, "Z")) { this.zendPceNode = pceNode; } allPceNodes.put(pceNode.getNodeId(), pceNode); LOG.debug("validateNode: node is saved {}", pceNode.getNodeId().getValue()); - return true; + return; } - private boolean validateOtnNode(Node node) { + private boolean isAZendPceNode(String serviceFormat, PceOpticalNode pceNode, String azNodeId, String azEndPoint) { + switch (serviceFormat) { + case "Ethernet": + case "OC": + if (pceNode.getSupNetworkNodeId().equals(azNodeId)) { + return true; + } + return false; + case "OTU": + if ("A".equals(azEndPoint) && pceNode.getNodeId().getValue() + .equals(this.input.getServiceAEnd().getRxDirection().getPort().getPortDeviceName())) { + return true; + } + if ("Z".equals(azEndPoint) && pceNode.getNodeId().getValue() + .equals(this.input.getServiceZEnd().getRxDirection().getPort().getPortDeviceName())) { + return true; + } + return false; + default: + LOG.debug("Unsupported service Format {} for node {}", serviceFormat, pceNode.getNodeId().getValue()); + return false; + } + } + private void validateOtnNode(Node node) { LOG.info("validateOtnNode: {} ", node.getNodeId().getValue()); // PceOtnNode will be used in Graph algorithm if (node.augmentation(Node1.class) != null) { @@ -517,13 +576,10 @@ public class PceCalculation { if (!pceOtnNode.isValid()) { LOG.warn(" validateOtnNode: Node {} is ignored", node.getNodeId().getValue()); - return false; + return; } - switch (validateNodeConstraints(pceOtnNode)) { - case HARD_EXCLUDE: - return false; - default: - break; + if (validateNodeConstraints(pceOtnNode).equals(ConstraintTypes.HARD_EXCLUDE)) { + return; } if (pceOtnNode.getNodeId().getValue().equals(anodeId) && this.aendPceNode == null) { this.aendPceNode = pceOtnNode; @@ -533,20 +589,11 @@ public class PceCalculation { } allPceNodes.put(pceOtnNode.getNodeId(), pceOtnNode); LOG.info("validateOtnNode: node {} is saved", node.getNodeId().getValue()); - return true; + return; } else { LOG.error("ValidateOtnNode: no node-type augmentation. Node {} is ignored", node.getNodeId().getValue()); - return false; + return; } - -// if (mode == "AZ") { -// pceOtnNode.validateAZxponder(anodeId, znodeId); -// } else if (mode == "intermediate") { -// pceOtnNode.validateIntermediateSwitch(); -// } else { -// LOG.error("validateOtnNode: unproper mode passed to the method : {} not supported", mode); -// return null; -// } } private ConstraintTypes validateNodeConstraints(PceNode pcenode) { @@ -574,7 +621,7 @@ public class PceCalculation { return ConstraintTypes.NONE; } - List constraints = new ArrayList(pceHardConstraints.getExcludeSRLG()); + List constraints = new ArrayList<>(pceHardConstraints.getExcludeSRLG()); constraints.retainAll(link.getsrlgList()); if (!constraints.isEmpty()) { LOG.info("validateLinkConstraints: {}", link.getLinkId().getValue()); @@ -587,9 +634,8 @@ public class PceCalculation { private void dropOppositeLink(Link link) { LinkId opplink = MapUtils.extractOppositeLink(link); - PceLink oppPceLink = allPceLinks.get(opplink); - if (oppPceLink != null) { - allPceLinks.remove(oppPceLink); + if (allPceLinks.containsKey(opplink)) { + allPceLinks.remove(opplink); } else { linksToExclude.add(opplink); } @@ -602,7 +648,7 @@ public class PceCalculation { this.azSrgs.add(nodeId); break; case XPONDER: - pceNode.initXndrTps(); + pceNode.initXndrTps(input.getServiceAEnd().getServiceFormat()); break; default: LOG.warn("endPceNode: Node {} is not SRG or XPONDER !", nodeId); @@ -610,7 +656,7 @@ public class PceCalculation { } if (!pceNode.isValid()) { - LOG.error("validateNode : there are no availaible wavelengths in node {}", pceNode.getNodeId().getValue()); + LOG.error("validateNode : there are no available frequencies in node {}", pceNode.getNodeId().getValue()); return false; } return true; @@ -640,12 +686,32 @@ public class PceCalculation { return returnStructure; } - private static void printNodesInfo(Map allpcenodes) { - Iterator> nodes = allpcenodes.entrySet().iterator(); - while (nodes.hasNext()) { - PceNode pcenode = nodes.next().getValue(); - List links = pcenode.getOutgoingLinks(); - LOG.info("In printNodes in node {} : outgoing links {} ", pcenode.getNodeId().getValue(), links.toString()); + private static void printNodesInfo(Map allPceNodes) { + allPceNodes.forEach(((nodeId, pceNode) -> { + LOG.info("In printNodes in node {} : outgoing links {} ", pceNode.getNodeId().getValue(), + pceNode.getOutgoingLinks()); + })); + } + + /** + * Get mc capability slot width granularity for device. + * @param deviceNodeId String + * @param nodeId NodeId + * @return slot width granularity + */ + private BigDecimal getSlotWidthGranularity(String deviceNodeId, NodeId nodeId) { + // nodeId: openroadm-topology level node + // deviceNodeId: openroadm-network level node + List mcCapabilities = mappingUtils.getMcCapabilitiesForNode(deviceNodeId); + String[] params = nodeId.getValue().split("-"); + // DEGX or SRGX + String rdmModuleName = params[params.length - 1]; + for (McCapabilities mcCapabitility : mcCapabilities) { + if (mcCapabitility.getMcNodeName().contains(rdmModuleName) + && mcCapabitility.getSlotWidthGranularity() != null) { + return mcCapabitility.getSlotWidthGranularity().getValue(); + } } + return GridConstant.SLOT_WIDTH_50; } }