X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceOpticalNode.java;h=01bf4d34cd22012090d892679659f6b2b2b4c83a;hb=56d1795b647693ec1d620d6aca2c4003e3b302ca;hp=0de4b60c41426d4003ff61d0332a82fd9e09890f;hpb=41bcd9973fefe2dc01cbe1c246d31d6bdceba120;p=transportpce.git diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java index 0de4b60c4..01bf4d34c 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java @@ -20,17 +20,19 @@ import java.util.TreeMap; import org.opendaylight.transportpce.common.fixedflex.GridConstant; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.pce.SortPortsByName; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmTpType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.available.freq.map.AvailFreqMapsKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOtsiOtsigroup; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.available.freq.map.AvailFreqMapsKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCH; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCHOTU4ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOtsiOtsigroup; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.SupportedIfCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129.ServiceFormat; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; import org.opendaylight.yangtools.yang.common.Uint16; @@ -64,7 +66,7 @@ public class PceOpticalNode implements PceNode { public PceOpticalNode(String deviceNodeId, String serviceType, PortMapping portMapping, Node node, OpenroadmNodeType nodeType, String version, BigDecimal slotWidthGranularity, - BigDecimal centralFreqGranularity) { + BigDecimal centralFreqGranularity) { if (deviceNodeId != null && serviceType != null @@ -84,9 +86,9 @@ public class PceOpticalNode implements PceNode { this.slotWidthGranularity = slotWidthGranularity; this.centralFreqGranularity = centralFreqGranularity; this.adminStates = node.augmentation(org.opendaylight.yang.gen.v1.http - .org.openroadm.common.network.rev200529.Node1.class).getAdministrativeState(); + .org.openroadm.common.network.rev211210.Node1.class).getAdministrativeState(); this.state = node.augmentation(org.opendaylight.yang.gen.v1.http - .org.openroadm.common.network.rev200529.Node1.class).getOperationalState(); + .org.openroadm.common.network.rev211210.Node1.class).getOperationalState(); } else { LOG.error("PceNode: one of parameters is not populated : nodeId, node type, slot width granularity"); this.valid = false; @@ -99,7 +101,7 @@ public class PceOpticalNode implements PceNode { if (!isValid()) { return; } - LOG.info("initSrgTpList: getting SRG tps from ROADM node {}", this.nodeId); + LOG.debug("initSrgTpList: getting SRG tps from ROADM node {}", this.nodeId); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 nodeTp = this.node.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang .ietf.network.topology.rev180226.Node1.class); @@ -113,30 +115,30 @@ public class PceOpticalNode implements PceNode { for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network .node.TerminationPoint tp : allTps) { TerminationPoint1 cntp1 = tp.augmentation(TerminationPoint1.class); - org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1 = tp - .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1 = tp + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210 .TerminationPoint1.class); OpenroadmTpType type = cntp1.getTpType(); - LOG.info("type = {} for tp {}", type.getName(), tp); + LOG.debug("type = {} for tp {}", type.getName(), tp); switch (type) { case SRGTXRXCP: case SRGRXCP: case SRGTXCP: if (State.InService.equals(cntp1.getOperationalState())) { - LOG.info("initSrgTpList: adding SRG-CP tp = {} ", tp.getTpId().getValue()); + LOG.debug("initSrgTpList: adding SRG-CP tp = {} ", tp.getTpId().getValue()); this.availableSrgCp.put(tp.getTpId().getValue(), cntp1.getTpType()); } break; case SRGRXPP: case SRGTXPP: case SRGTXRXPP: - LOG.info("initSrgTpList: SRG-PP tp = {} found", tp.getTpId().getValue()); + LOG.debug("initSrgTpList: SRG-PP tp = {} found", tp.getTpId().getValue()); if (isTerminationPointAvailable(nttp1)) { - LOG.info("initSrgTpList: adding SRG-PP tp '{}'", tp.getTpId().getValue()); + LOG.debug("initSrgTpList: adding SRG-PP tp '{}'", tp.getTpId().getValue()); this.availableSrgPp.put(tp.getTpId().getValue(), cntp1.getTpType()); if (State.InService.equals(cntp1.getOperationalState())) { - LOG.info("initSrgTpList: adding SRG-PP tp '{}'", tp.getTpId().getValue()); + LOG.debug("initSrgTpList: adding SRG-PP tp '{}'", tp.getTpId().getValue()); this.availableSrgPp.put(tp.getTpId().getValue(), cntp1.getTpType()); } } else { @@ -152,12 +154,12 @@ public class PceOpticalNode implements PceNode { this.valid = false; return; } - LOG.info("initSrgTpList: availableSrgPp size = {} && availableSrgCp size = {} in {}", + LOG.debug("initSrgTpList: availableSrgPp size = {} && availableSrgCp size = {} in {}", this.availableSrgPp.size(), this.availableSrgCp.size(), this); } private boolean isTerminationPointAvailable( - org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1) { + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1) { byte[] availableByteArray = new byte[GridConstant.NB_OCTECTS]; Arrays.fill(availableByteArray, (byte) GridConstant.AVAILABLE_SLOT_VALUE); return nttp1 == null || nttp1.getPpAttributes() == null @@ -177,19 +179,15 @@ public class PceOpticalNode implements PceNode { } switch (this.serviceType) { case "400GE": - if (mapping.getSupportedInterfaceCapability().contains(IfOtsiOtsigroup.class)) { - return true; - } else { - return false; + for (Class ifCap : mapping.getSupportedInterfaceCapability()) { + if (ifCap.equals(IfOtsiOtsigroup.class)) { + return true; + } } + return false; case "100GE": - if (mapping.getSupportedInterfaceCapability().contains( - org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.IfOCH.class) - || mapping.getSupportedInterfaceCapability().contains(IfOCH.class)) { - return true; - } else { - return false; - } + return mapping.getSupportedInterfaceCapability().contains(IfOCH.class) + || mapping.getSupportedInterfaceCapability().contains(IfOCHOTU4ODU4.class); default: return true; } @@ -200,8 +198,8 @@ public class PceOpticalNode implements PceNode { return; } Node1 node1 = this.node.augmentation(Node1.class); - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 node11 = - this.node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1 node11 = + this.node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1 .class); switch (this.nodeType) { case SRG : @@ -240,7 +238,6 @@ public class PceOpticalNode implements PceNode { if (!State.InService.equals(node11.getOperationalState())) { this.valid = false; LOG.error("initWLlist: XPDR node {} is OOS/degraded", this); - return; } break; default: @@ -250,26 +247,25 @@ public class PceOpticalNode implements PceNode { } public void initXndrTps(ServiceFormat serviceFormat) { - LOG.info("PceNod: initXndrTps for node : {}", this.nodeId); + LOG.debug("PceNod: initXndrTps for node : {}", this.nodeId); if (!isValid()) { return; } + this.valid = false; org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 nodeTp = this.node.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang .ietf.network.topology.rev180226.Node1.class); List allTps = new ArrayList<>(nodeTp.nonnullTerminationPoint().values()); if (allTps.isEmpty()) { - this.valid = false; LOG.error("initXndrTps: XPONDER TerminationPoint list is empty for node {}", this); return; } - this.valid = false; for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network .node.TerminationPoint tp : allTps) { TerminationPoint1 cntp1 = tp.augmentation(TerminationPoint1.class); if (cntp1.getTpType() != OpenroadmTpType.XPONDERNETWORK) { - LOG.warn("initXndrTps: {} is not an Xponder network port", cntp1.getTpType().getName()); + LOG.debug("initXndrTps: {} is not an Xponder network port", cntp1.getTpType().getName()); continue; } if (!isTpWithGoodCapabilities(tp)) { @@ -278,31 +274,27 @@ public class PceOpticalNode implements PceNode { } if (!State.InService.equals(cntp1.getOperationalState())) { LOG.warn("initXndrTps: XPONDER tp = {} is OOS/degraded", tp.getTpId().getValue()); - this.valid = false; continue; } - org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1 = tp - .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1 = tp + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210 .TerminationPoint1.class); if (nttp1 != null && nttp1.getXpdrNetworkAttributes().getWavelength() != null) { this.usedXpndrNWTps.add(tp.getTpId().getValue()); - LOG.info("initXndrTps: XPONDER tp = {} is used", tp.getTpId().getValue()); - } else { - this.valid = true; + LOG.debug("initXndrTps: XPONDER tp = {} is used", tp.getTpId().getValue()); + continue; } // find Client of this network TP - String client; - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.TerminationPoint1 tpceTp1 = - tp.augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511 - .TerminationPoint1.class); - if (tpceTp1 != null) { - client = tpceTp1.getAssociatedConnectionMapPort(); + if (cntp1.getAssociatedConnectionMapTp() != null) { + String client = cntp1.getAssociatedConnectionMapTp().iterator().next().getValue(); if (client != null) { this.clientPerNwTp.put(tp.getTpId().getValue(), client); this.valid = true; } else { LOG.error("Service Format {} not managed yet", serviceFormat.getName()); } + } else { + this.valid = true; } } if (!isValid()) { @@ -311,8 +303,8 @@ public class PceOpticalNode implements PceNode { } @Override - public String getRdmSrgClient(String tp) { - LOG.info("getRdmSrgClient: Getting PP client for tp '{}' on node : {}", tp, this.nodeId); + public String getRdmSrgClient(String tp, String direction) { + LOG.debug("getRdmSrgClient: Getting PP client for tp '{}' on node : {}", tp, this.nodeId); OpenroadmTpType srgType = null; OpenroadmTpType cpType = this.availableSrgCp.get(tp); if (cpType == null) { @@ -321,51 +313,53 @@ public class PceOpticalNode implements PceNode { } switch (cpType) { case SRGTXRXCP: - LOG.info("getRdmSrgClient: Getting BI Directional PP port ..."); - srgType = OpenroadmTpType.SRGTXRXPP; + LOG.debug("getRdmSrgClient: Getting BI Directional PP port ..."); + // Take the first-element in the available PP key set + if (availableSrgPp.entrySet().iterator().next().getKey() + // and check if the port is bidirectional + .contains("TXRX")) { + srgType = OpenroadmTpType.SRGTXRXPP; + } else if (direction.equalsIgnoreCase("aToz")) { + srgType = OpenroadmTpType.SRGRXPP; + } else { + srgType = OpenroadmTpType.SRGTXPP; + } break; case SRGTXCP: - LOG.info("getRdmSrgClient: Getting UNI Rx PP port ..."); + LOG.debug("getRdmSrgClient: Getting UNI Rx PP port ..."); srgType = OpenroadmTpType.SRGRXPP; break; case SRGRXCP: - LOG.info("getRdmSrgClient: Getting UNI Tx PP port ..."); + LOG.debug("getRdmSrgClient: Getting UNI Tx PP port ..."); srgType = OpenroadmTpType.SRGTXPP; break; default: break; } - LOG.info("getRdmSrgClient: Getting client PP for CP '{}'", tp); - if (!this.availableSrgPp.isEmpty()) { - Optional client = null; - final OpenroadmTpType openType = srgType; - client = this.availableSrgPp.entrySet() - .stream().filter(pp -> pp.getValue().getName().equals(openType.getName())) - .map(Map.Entry::getKey) - .sorted(new SortPortsByName()) - .findFirst(); - if (!client.isPresent()) { - LOG.error("getRdmSrgClient: ROADM {} doesn't have PP Client for CP {}", this, tp); - return null; - } - LOG.info("getRdmSrgClient: client PP {} for CP {} found !", client, tp); - return client.get(); - } else { + LOG.debug("getRdmSrgClient: Getting client PP for CP '{}'", tp); + if (this.availableSrgPp.isEmpty()) { LOG.error("getRdmSrgClient: SRG TerminationPoint PP list is not available for node {}", this); return null; } + final OpenroadmTpType openType = srgType; + Optional client = this.availableSrgPp.entrySet() + .stream().filter(pp -> pp.getValue().getName().equals(openType.getName())) + .map(Map.Entry::getKey).min(new SortPortsByName()); + if (client.isEmpty()) { + LOG.error("getRdmSrgClient: ROADM {} doesn't have PP Client for CP {}", this, tp); + return null; + } + LOG.debug("getRdmSrgClient: client PP {} for CP {} found !", client, tp); + return client.get(); } public void validateAZxponder(String anodeId, String znodeId, ServiceFormat serviceFormat) { - if (!isValid()) { - return; - } - if (this.nodeType != OpenroadmNodeType.XPONDER) { + if (!isValid() || this.nodeType != OpenroadmNodeType.XPONDER) { return; } // Detect A and Z - if (this.getSupNetworkNodeId().equals(anodeId) || (this.getSupNetworkNodeId().equals(znodeId))) { + if (anodeId.contains(this.getSupNetworkNodeId()) || (znodeId.contains(this.getSupNetworkNodeId()))) { LOG.info("validateAZxponder: A or Z node detected == {}", nodeId.getValue()); initXndrTps(serviceFormat); return;