import org.opendaylight.transportpce.pce.PceComplianceCheck;
import org.opendaylight.transportpce.pce.constraints.PceConstraints;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mc.capabilities.McCapabilities;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.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;
serviceFormatA = input.getServiceAEnd().getServiceFormat().getName();
serviceFormatZ = input.getServiceZEnd().getServiceFormat().getName();
serviceRate = input.getServiceAEnd().getServiceRate();
- if (NodeTypes.Xpdr.equals(portMapping.getNode(input.getServiceAEnd().getNodeId()).getNodeInfo().getNodeType())
+ serviceType = ServiceTypes.getServiceType(serviceFormatA, serviceRate,
+ (NodeTypes.Xpdr.equals(portMapping.getNode(input.getServiceAEnd().getNodeId()).getNodeInfo().getNodeType())
&& input.getServiceAEnd().getTxDirection() != null
&& input.getServiceAEnd().getTxDirection().getPort() != null
- && input.getServiceAEnd().getTxDirection().getPort().getPortName() != null) {
- Mapping mapping = portMapping.getMapping(input.getServiceAEnd().getNodeId(),
- input.getServiceAEnd().getTxDirection().getPort().getPortName());
- serviceType = ServiceTypes.getServiceType(serviceFormatA, serviceRate, mapping);
- } else {
- serviceType = ServiceTypes.getServiceType(serviceFormatA, serviceRate, null);
- }
+ && input.getServiceAEnd().getTxDirection().getPort().getPortName() != null)
+ ? portMapping.getMapping(input.getServiceAEnd().getNodeId(),
+ input.getServiceAEnd().getTxDirection().getPort().getPortName())
+ : null);
LOG.info("parseInput: A and Z :[{}] and [{}]", anodeId, znodeId);
}
private void getAZnodeId() {
- if (StringConstants.SERVICE_TYPE_ODU4.equals(serviceType)
- || StringConstants.SERVICE_TYPE_ODUC4.equals(serviceType)
- || StringConstants.SERVICE_TYPE_100GE_M.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();
+ switch (serviceType) {
+ case StringConstants.SERVICE_TYPE_ODU4:
+ case StringConstants.SERVICE_TYPE_ODUC2:
+ case StringConstants.SERVICE_TYPE_ODUC3:
+ case StringConstants.SERVICE_TYPE_ODUC4:
+ case StringConstants.SERVICE_TYPE_100GE_M:
+ case StringConstants.SERVICE_TYPE_100GE_S:
+ case StringConstants.SERVICE_TYPE_10GE:
+ case StringConstants.SERVICE_TYPE_1GE:
+ anodeId = input.getServiceAEnd().getTxDirection().getPort().getPortDeviceName();
+ znodeId = input.getServiceZEnd().getTxDirection().getPort().getPortDeviceName();
+ break;
+ default:
+ anodeId = input.getServiceAEnd().getNodeId();
+ znodeId = input.getServiceZEnd().getNodeId();
+ break;
}
}
case StringConstants.SERVICE_TYPE_100GE_T:
case StringConstants.SERVICE_TYPE_400GE:
case StringConstants.SERVICE_TYPE_OTU4:
+ case StringConstants.SERVICE_TYPE_OTUC2:
+ case StringConstants.SERVICE_TYPE_OTUC3:
case StringConstants.SERVICE_TYPE_OTUC4:
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();
break;
case StringConstants.SERVICE_TYPE_100GE_M:
+ case StringConstants.SERVICE_TYPE_100GE_S:
case StringConstants.SERVICE_TYPE_ODU4:
+ case StringConstants.SERVICE_TYPE_ODUC2:
+ case StringConstants.SERVICE_TYPE_ODUC3:
case StringConstants.SERVICE_TYPE_ODUC4:
case StringConstants.SERVICE_TYPE_10GE:
case StringConstants.SERVICE_TYPE_1GE:
break;
}
- if (readTopology(nwInstanceIdentifier) != null) {
- allNodes = readTopology(nwInstanceIdentifier).nonnullNode().values().stream().sorted((n1, n2)
- -> n1.getNodeId().getValue().compareTo(n2.getNodeId().getValue())).collect(Collectors.toList());
- Network1 nw1 = readTopology(nwInstanceIdentifier).augmentation(Network1.class);
- if (nw1 != null) {
- 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");
- }
- if (allNodes == null || allNodes.isEmpty()) {
- LOG.error("readMdSal: no nodes ");
- return false;
- }
- LOG.info("readMdSal: network nodes: {} nodes added", allNodes.size());
- 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);
+ if (readTopology(nwInstanceIdentifier) == null) {
+ LOG.error("readMdSal: network is null: {}", nwInstanceIdentifier);
+ return false;
+ }
- return true;
+ allNodes = readTopology(nwInstanceIdentifier).nonnullNode().values().stream().sorted((n1, n2)
+ -> n1.getNodeId().getValue().compareTo(n2.getNodeId().getValue())).collect(Collectors.toList());
+ Network1 nw1 = readTopology(nwInstanceIdentifier).augmentation(Network1.class);
+ if (nw1 == null) {
+ LOG.warn("no otn links in otn-topology");
} else {
- LOG.error("readMdSal: network is null: {}", nwInstanceIdentifier);
+ allLinks = nw1.nonnullLink().values().stream().sorted((l1, l2)
+ -> l1.getSource().getSourceTp().getValue().compareTo(l2.getSource().getSourceTp().getValue()))
+ .collect(Collectors.toList());
+ }
+ if (allNodes == null || allNodes.isEmpty()) {
+ LOG.error("readMdSal: no nodes ");
+ return false;
+ }
+ LOG.info("readMdSal: network nodes: {} nodes added", allNodes.size());
+ 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);
+
+ return true;
}
private Network readTopology(InstanceIdentifier<Network> nwInstanceIdentifier) {
private boolean analyzeNw() {
LOG.debug("analyzeNw: allNodes size {}, allLinks size {}", allNodes.size(), allLinks.size());
+ switch (serviceType) {
+ case StringConstants.SERVICE_TYPE_100GE_T:
+ case StringConstants.SERVICE_TYPE_OTU4:
+ case StringConstants.SERVICE_TYPE_400GE:
+ case StringConstants.SERVICE_TYPE_OTUC2:
+ case StringConstants.SERVICE_TYPE_OTUC3:
+ case StringConstants.SERVICE_TYPE_OTUC4:
+ // 100GE service and OTU4 service are handled at the openroadm-topology layer
+ for (Node node : allNodes) {
+ validateNode(node);
+ }
- if (StringConstants.SERVICE_TYPE_100GE_T.equals(serviceType)
- || StringConstants.SERVICE_TYPE_OTU4.equals(serviceType)
- || StringConstants.SERVICE_TYPE_400GE.equals(serviceType)
- || StringConstants.SERVICE_TYPE_OTUC4.equals(serviceType)) {
- // 100GE service and OTU4 service are handled at the openroadm-topology layer
- for (Node node : allNodes) {
- validateNode(node);
- }
-
- LOG.debug("analyzeNw: allPceNodes size {}", allPceNodes.size());
+ LOG.debug("analyzeNw: allPceNodes size {}", allPceNodes.size());
- if (aendPceNode == null || zendPceNode == null) {
- LOG.error("analyzeNw: Error in reading nodes: A or Z do not present in the network");
- return false;
- }
- for (Link link : allLinks) {
- validateLink(link);
- }
- // debug prints
- LOG.debug("analyzeNw: addLinks size {}, dropLinks size {}", addLinks.size(), dropLinks.size());
- // debug prints
- LOG.debug("analyzeNw: azSrgs size = {}", azSrgs.size());
- for (NodeId srg : azSrgs) {
- LOG.debug("analyzeNw: A/Z Srgs SRG = {}", srg.getValue());
- }
- // debug prints
- for (PceLink link : addLinks) {
- filteraddLinks(link);
- }
- for (PceLink link : dropLinks) {
- filterdropLinks(link);
- }
+ if (aendPceNode == null || zendPceNode == null) {
+ LOG.error("analyzeNw: Error in reading nodes: A or Z do not present in the network");
+ return false;
+ }
+ for (Link link : allLinks) {
+ validateLink(link);
+ }
+ // debug prints
+ LOG.debug("analyzeNw: addLinks size {}, dropLinks size {}", addLinks.size(), dropLinks.size());
+ // debug prints
+ LOG.debug("analyzeNw: azSrgs size = {}", azSrgs.size());
+ for (NodeId srg : azSrgs) {
+ LOG.debug("analyzeNw: A/Z Srgs SRG = {}", srg.getValue());
+ }
+ // debug prints
+ for (PceLink link : addLinks) {
+ filteraddLinks(link);
+ }
+ for (PceLink link : dropLinks) {
+ filterdropLinks(link);
+ }
+ break;
- } else {
- // ODU4, 10GE/ODU2e or 1GE/ODU0 services are handled at openroadm-otn layer
+ default:
+ // ODU4, 10GE/ODU2e or 1GE/ODU0 services are handled at openroadm-otn layer
- for (Node node : allNodes) {
- validateOtnNode(node);
- }
+ for (Node node : allNodes) {
+ validateOtnNode(node);
+ }
- LOG.info("analyzeNw: allPceNodes {}", allPceNodes);
+ 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");
- return false;
- }
- for (Link link : allLinks) {
- validateLink(link);
- }
+ if (aendPceNode == null || zendPceNode == null) {
+ LOG.error("analyzeNw: Error in reading nodes: A or Z do not present in the network");
+ return false;
+ }
+ for (Link link : allLinks) {
+ validateLink(link);
+ }
+ break;
}
LOG.info("analyzeNw: allPceNodes size {}, allPceLinks size {}", allPceNodes.size(), allPceLinks.size());
switch (serviceType) {
case StringConstants.SERVICE_TYPE_100GE_T:
case StringConstants.SERVICE_TYPE_OTU4:
+ case StringConstants.SERVICE_TYPE_OTUC2:
+ case StringConstants.SERVICE_TYPE_OTUC3:
case StringConstants.SERVICE_TYPE_OTUC4:
case StringConstants.SERVICE_TYPE_400GE:
return processPceLink(link, sourceId, destId, source, dest);
case StringConstants.SERVICE_TYPE_ODU4:
case StringConstants.SERVICE_TYPE_10GE:
case StringConstants.SERVICE_TYPE_100GE_M:
+ case StringConstants.SERVICE_TYPE_100GE_S:
+ case StringConstants.SERVICE_TYPE_ODUC2:
+ case StringConstants.SERVICE_TYPE_ODUC3:
case StringConstants.SERVICE_TYPE_ODUC4:
case StringConstants.SERVICE_TYPE_1GE:
return processPceOtnLink(link, source, dest);
if (validateNodeConstraints(pceNode).equals(ConstraintTypes.HARD_EXCLUDE)) {
return;
}
- if (endPceNode(nodeType, pceNode.getNodeId(), pceNode) && this.aendPceNode == null
- && isAZendPceNode(this.serviceFormatA, pceNode, anodeId, "A")) {
- this.aendPceNode = pceNode;
- }
- if (endPceNode(nodeType, pceNode.getNodeId(), pceNode) && this.zendPceNode == null
- && isAZendPceNode(this.serviceFormatZ, pceNode, znodeId, "Z")) {
- this.zendPceNode = pceNode;
+
+ if (endPceNode(nodeType, pceNode.getNodeId(), pceNode)) {
+ if (this.aendPceNode == null && isAZendPceNode(this.serviceFormatA, pceNode, anodeId, "A")) {
+ // Added to ensure A-node has a addlink in the topology
+ List<Link> links = this.allLinks.stream()
+ .filter(x -> x.getSource().getSourceNode().getValue().contains(pceNode.getNodeId().getValue()))
+ .collect(Collectors.toList());
+ if (links.size() > 0) {
+ this.aendPceNode = pceNode;
+ }
+ }
+ if (this.zendPceNode == null && isAZendPceNode(this.serviceFormatZ, pceNode, znodeId, "Z")) {
+ // Added to ensure Z-node has a droplink in the topology
+ List<Link> links = this.allLinks.stream()
+ .filter(x -> x.getDestination().getDestNode().getValue().contains(pceNode.getNodeId().getValue()))
+ .collect(Collectors.toList());
+ if (links.size() > 0) {
+ this.zendPceNode = pceNode;
+ }
+ }
}
allPceNodes.put(pceNode.getNodeId(), pceNode);
private void validateOtnNode(Node node) {
LOG.info("validateOtnNode: {} ", node.getNodeId().getValue());
// PceOtnNode will be used in Graph algorithm
- if (node.augmentation(Node1.class) != null) {
- OpenroadmNodeType nodeType = node.augmentation(Node1.class).getNodeType();
-
- PceOtnNode pceOtnNode = new PceOtnNode(node, nodeType, node.getNodeId(), "otn", serviceType);
- pceOtnNode.validateXponder(anodeId, znodeId);
+ if (node.augmentation(Node1.class) == null) {
+ LOG.error("ValidateOtnNode: no node-type augmentation. Node {} is ignored", node.getNodeId().getValue());
+ return;
+ }
- if (!pceOtnNode.isValid()) {
- LOG.warn(" validateOtnNode: Node {} is ignored", node.getNodeId().getValue());
- return;
- }
- if (validateNodeConstraints(pceOtnNode).equals(ConstraintTypes.HARD_EXCLUDE)) {
- return;
- }
- if (pceOtnNode.getNodeId().getValue().equals(anodeId) && this.aendPceNode == null) {
- this.aendPceNode = pceOtnNode;
- }
- if (pceOtnNode.getNodeId().getValue().equals(znodeId) && this.zendPceNode == null) {
- this.zendPceNode = pceOtnNode;
- }
- allPceNodes.put(pceOtnNode.getNodeId(), pceOtnNode);
- LOG.info("validateOtnNode: node {} is saved", node.getNodeId().getValue());
+ OpenroadmNodeType nodeType = node.augmentation(Node1.class).getNodeType();
+ String clientPort = null;
+ if (node.getNodeId().getValue().equals(anodeId)
+ && this.aendPceNode == null
+ && input.getServiceAEnd() != null
+ && input.getServiceAEnd().getRxDirection() != null
+ && input.getServiceAEnd().getRxDirection().getPort() != null
+ && input.getServiceAEnd().getRxDirection().getPort().getPortName() != null) {
+ clientPort = input.getServiceAEnd().getRxDirection().getPort().getPortName();
+ } else if (node.getNodeId().getValue().equals(znodeId)
+ && this.zendPceNode == null
+ && input.getServiceZEnd() != null
+ && input.getServiceZEnd().getRxDirection() != null
+ && input.getServiceZEnd().getRxDirection().getPort() != null
+ && input.getServiceZEnd().getRxDirection().getPort().getPortName() != null) {
+ clientPort = input.getServiceZEnd().getRxDirection().getPort().getPortName();
+ }
+
+ PceOtnNode pceOtnNode = new PceOtnNode(node, nodeType, node.getNodeId(), "otn", serviceType, clientPort);
+ pceOtnNode.validateXponder(anodeId, znodeId);
+
+ if (!pceOtnNode.isValid()) {
+ LOG.warn(" validateOtnNode: Node {} is ignored", node.getNodeId().getValue());
return;
- } else {
- LOG.error("ValidateOtnNode: no node-type augmentation. Node {} is ignored", node.getNodeId().getValue());
+ }
+ if (validateNodeConstraints(pceOtnNode).equals(ConstraintTypes.HARD_EXCLUDE)) {
return;
}
+ if (pceOtnNode.getNodeId().getValue().equals(anodeId) && this.aendPceNode == null) {
+ this.aendPceNode = pceOtnNode;
+ }
+ if (pceOtnNode.getNodeId().getValue().equals(znodeId) && this.zendPceNode == null) {
+ this.zendPceNode = pceOtnNode;
+ }
+ allPceNodes.put(pceOtnNode.getNodeId(), pceOtnNode);
+ LOG.info("validateOtnNode: node {} is saved", node.getNodeId().getValue());
+ return;
}
private ConstraintTypes validateNodeConstraints(PceNode pcenode) {
pcelink.getlinkType(), pcelink);
break;
case ADDLINK:
- pcelink.setClient(source.getRdmSrgClient(pcelink.getSourceTP().toString()));
+ pcelink.setClient(source.getRdmSrgClient(pcelink.getSourceTP().getValue()));
addLinks.add(pcelink);
LOG.debug("validateLink: ADD-LINK saved {}", pcelink);
break;
case DROPLINK:
- pcelink.setClient(dest.getRdmSrgClient(pcelink.getDestTP().toString()));
+ pcelink.setClient(dest.getRdmSrgClient(pcelink.getDestTP().getValue()));
dropLinks.add(pcelink);
LOG.debug("validateLink: DROP-LINK saved {}", pcelink);
break;
// store separately all SRG links directly
azSrgs.add(sourceId);
// connected to A/Z
- if (!dest.checkTP(pcelink.getDestTP().toString())) {
+ if (!dest.checkTP(pcelink.getDestTP().getValue())) {
LOG.debug(
"validateLink: XPONDER-INPUT is rejected as NW port is busy - {} ", pcelink);
return false;
}
- if (dest.getXpdrClient(pcelink.getDestTP().toString()) != null) {
- pcelink.setClient(dest.getXpdrClient(pcelink.getDestTP().toString()));
+ if (dest.getXpdrClient(pcelink.getDestTP().getValue()) != null) {
+ pcelink.setClient(dest.getXpdrClient(pcelink.getDestTP().getValue()));
}
allPceLinks.put(linkId, pcelink);
source.addOutgoingLink(pcelink);
// store separately all SRG links directly
azSrgs.add(destId);
// connected to A/Z
- if (!source.checkTP(pcelink.getSourceTP().toString())) {
+ if (!source.checkTP(pcelink.getSourceTP().getValue())) {
LOG.debug(
"validateLink: XPONDER-OUTPUT is rejected as NW port is busy - {} ", pcelink);
return false;
}
- if (source.getXpdrClient(pcelink.getSourceTP().toString()) != null) {
- pcelink.setClient(source.getXpdrClient(pcelink.getSourceTP().toString()));
+ if (source.getXpdrClient(pcelink.getSourceTP().getValue()) != null) {
+ pcelink.setClient(source.getXpdrClient(pcelink.getSourceTP().getValue()));
}
allPceLinks.put(linkId, pcelink);
source.addOutgoingLink(pcelink);
switch (pceOtnLink.getlinkType()) {
case OTNLINK:
- if (dest.getXpdrClient(pceOtnLink.getDestTP().toString()) != null) {
- pceOtnLink.setClient(dest.getXpdrClient(pceOtnLink.getDestTP().toString()));
+ if (source.getXpdrClient(pceOtnLink.getSourceTP().getValue()) != null) {
+ pceOtnLink.setClient(source.getXpdrClient(pceOtnLink.getSourceTP().getValue()));
+ }
+ if (dest.getXpdrClient(pceOtnLink.getDestTP().getValue()) != null) {
+ pceOtnLink.setClient(dest.getXpdrClient(pceOtnLink.getDestTP().getValue()));
}
-
allPceLinks.put(linkId, pceOtnLink);
source.addOutgoingLink(pceOtnLink);
LOG.info("validateLink: OTN-LINK added to allPceLinks {}", pceOtnLink);
Code Review / transportpce.git / blobdiff