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=c72d9034ab997b2c794351cc642b57ec6a3a99c8;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=17000587b6fa564f35997fa9d456c14d1590f982;hpb=7e175bf72bc28db4299b1fd76e6d01bdb0854d0f;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 17000587b..c72d9034a 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 @@ -8,6 +8,7 @@ package org.opendaylight.transportpce.pce.networkanalyzer; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; @@ -17,12 +18,18 @@ import java.util.Map; import java.util.Optional; 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.rev210315.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.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.IfOTUCnODUCn; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.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; @@ -37,7 +44,12 @@ public class PceOpticalNode implements PceNode { private Node node; private NodeId nodeId; + private String deviceNodeId; private OpenroadmNodeType nodeType; + private AdminStates adminStates; + private State state; + private String serviceType; + private PortMapping portMapping; private Map availableSrgPp = new TreeMap<>(); private Map availableSrgCp = new TreeMap<>(); @@ -47,18 +59,32 @@ public class PceOpticalNode implements PceNode { private final AvailFreqMapsKey freqMapKey = new AvailFreqMapsKey(GridConstant.C_BAND); private BitSet frequenciesBitSet; private String version; + private BigDecimal slotWidthGranularity; - public PceOpticalNode(Node node, OpenroadmNodeType nodeType, String version) { - if (node != null + public PceOpticalNode(String deviceNodeId, String serviceType, PortMapping portMapping, Node node, + OpenroadmNodeType nodeType, String version, BigDecimal slotWidthGranularity) { + if (deviceNodeId != null + && serviceType != null + && portMapping != null + && node != null && node.getNodeId() != null && nodeType != null - && version != null) { + && version != null + && slotWidthGranularity != null) { + this.deviceNodeId = deviceNodeId; + this.serviceType = serviceType; + this.portMapping = portMapping; this.node = node; this.nodeId = node.getNodeId(); this.nodeType = nodeType; this.version = version; + this.slotWidthGranularity = slotWidthGranularity; + this.adminStates = node.augmentation(org.opendaylight.yang.gen.v1.http + .org.openroadm.common.network.rev200529.Node1.class).getAdministrativeState(); + this.state = node.augmentation(org.opendaylight.yang.gen.v1.http + .org.openroadm.common.network.rev200529.Node1.class).getOperationalState(); } else { - LOG.error("PceNode: one of parameters is not populated : nodeId, node type"); + LOG.error("PceNode: one of parameters is not populated : nodeId, node type, slot width granularity"); this.valid = false; } } @@ -93,8 +119,10 @@ public class PceOpticalNode implements PceNode { case SRGTXRXCP: case SRGRXCP: case SRGTXCP: - LOG.info("initSrgTpList: adding SRG-CP tp = {} ", tp.getTpId().getValue()); - this.availableSrgCp.put(tp.getTpId().getValue(), cntp1.getTpType()); + if (State.InService.equals(cntp1.getOperationalState())) { + LOG.info("initSrgTpList: adding SRG-CP tp = {} ", tp.getTpId().getValue()); + this.availableSrgCp.put(tp.getTpId().getValue(), cntp1.getTpType()); + } break; case SRGRXPP: case SRGTXPP: @@ -103,6 +131,10 @@ public class PceOpticalNode implements PceNode { if (isTerminationPointAvailable(nttp1)) { LOG.info("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()); + this.availableSrgPp.put(tp.getTpId().getValue(), cntp1.getTpType()); + } } else { LOG.warn("initSrgTpList: SRG-PP tp = {} found is busy !!", tp.getTpId().getValue()); } @@ -132,13 +164,48 @@ public class PceOpticalNode implements PceNode { availableByteArray); } + private boolean isTpWithGoodCapabilities( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node + .TerminationPoint tp) { + Mapping mapping = this.portMapping.getMapping(deviceNodeId, tp.getTpId().getValue()); + if (mapping == null || mapping.getSupportedInterfaceCapability() == null) { + return true; + } + switch (this.serviceType) { + case "400GE": + if (mapping.getSupportedInterfaceCapability().contains(IfOTUCnODUCn.class)) { + return true; + } else { + 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; + } + default: + return true; + } + } + public void initFrequenciesBitSet() { if (!isValid()) { 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 + .class); switch (this.nodeType) { case SRG : + if (!State.InService.equals(node11.getOperationalState())) { + this.valid = false; + LOG.error("initWLlist: SRG node {} is OOS/degraded", this); + return; + } if (!node1.getSrgAttributes().nonnullAvailFreqMaps().containsKey(freqMapKey)) { LOG.error("initFrequenciesBitSet: SRG no cband available freq maps for node {}", this); this.valid = false; @@ -148,6 +215,11 @@ public class PceOpticalNode implements PceNode { .nonnullAvailFreqMaps().get(freqMapKey).getFreqMap()); break; case DEGREE : + if (!State.InService.equals(node11.getOperationalState())) { + this.valid = false; + LOG.error("initWLlist: Degree node {} is OOS/degraded", this); + return; + } if (!node1.getDegreeAttributes().nonnullAvailFreqMaps().containsKey(freqMapKey)) { LOG.error("initFrequenciesBitSet: DEG no cband available freq maps for node {}", this); this.valid = false; @@ -161,6 +233,11 @@ public class PceOpticalNode implements PceNode { this.frequenciesBitSet = new BitSet(GridConstant.EFFECTIVE_BITS); //set all bits to true (available) this.frequenciesBitSet.set(0, GridConstant.EFFECTIVE_BITS); + if (!State.InService.equals(node11.getOperationalState())) { + this.valid = false; + LOG.error("initWLlist: XPDR node {} is OOS/degraded", this); + return; + } break; default: LOG.error("initFrequenciesBitSet: unsupported node type {} in node {}", this.nodeType, this); @@ -187,32 +264,37 @@ 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); + if (cntp1.getTpType() != OpenroadmTpType.XPONDERNETWORK) { + LOG.warn("initXndrTps: {} is not an Xponder network port", cntp1.getTpType().getName()); + continue; + } + if (!isTpWithGoodCapabilities(tp)) { + LOG.warn("initXndrTps: {} network port has not correct if-capabilities", tp.getTpId().getValue()); + continue; + } + 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 .TerminationPoint1.class); - if (cntp1.getTpType() == OpenroadmTpType.XPONDERNETWORK) { - 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; - } - // find Client of this network TP - String client; - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1 tpceTp1 = + 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; + } + // find Client of this network TP + String client; + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1 tpceTp1 = tp.augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019 - .TerminationPoint1.class); - if (tpceTp1 != null) { - client = tpceTp1.getAssociatedConnectionMapPort(); - if (client != null) { - this.clientPerNwTp.put(tp.getTpId().getValue(), client); - this.valid = true; - } else { - LOG.error("initXndrTps: XPONDER {} NW TP doesn't have defined Client {}", - this, tp.getTpId().getValue()); - } - } else if (ServiceFormat.OTU.equals(serviceFormat)) { - LOG.info("Infrastructure OTU4 connection"); + .TerminationPoint1.class); + if (tpceTp1 != null) { + client = tpceTp1.getAssociatedConnectionMapPort(); + if (client != null) { + this.clientPerNwTp.put(tp.getTpId().getValue(), client); this.valid = true; } else { LOG.error("Service Format {} not managed yet", serviceFormat.getName()); @@ -295,8 +377,9 @@ public class PceOpticalNode implements PceNode { public boolean isValid() { if (node == null || nodeId == null || nodeType == null || this.getSupNetworkNodeId() == null - || this.getSupClliNodeId() == null) { - LOG.error("PceNode: one of parameters is not populated : nodeId, node type, supporting nodeId"); + || this.getSupClliNodeId() == null || adminStates == null || state == null) { + LOG.error("PceNode: one of parameters is not populated : nodeId, node type, supporting nodeId, " + + "admin state, operational state"); valid = false; } return valid; @@ -307,6 +390,16 @@ public class PceOpticalNode implements PceNode { return outgoingLinks; } + @Override + public AdminStates getAdminStates() { + return adminStates; + } + + @Override + public State getState() { + return state; + } + @Override public NodeId getNodeId() { return nodeId; @@ -372,4 +465,14 @@ public class PceOpticalNode implements PceNode { return this.version; } + /* + * (non-Javadoc) + * + * @see org.opendaylight.transportpce.pce.networkanalyzer.PceNode#getSlotWidthGranularity() + */ + @Override + public BigDecimal getSlotWidthGranularity() { + return slotWidthGranularity; + } + }