X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceOtnNode.java;h=3dc362796a5560d58c12093b694d8974119730a2;hb=b5ee86a522ce3cf5c6216f10647edb08b31c72e9;hp=ec1043fc123a27887a32f41bd14d97381f53fe30;hpb=7f30d5b1d8c5f1e04a9a1595887aa260ff84a46f;p=transportpce.git diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java index ec1043fc1..3dc362796 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java @@ -8,7 +8,9 @@ package org.opendaylight.transportpce.pce.networkanalyzer; +import java.math.BigDecimal; import java.util.ArrayList; +import java.util.BitSet; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -16,19 +18,24 @@ import java.util.Map; import java.util.TreeMap; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.OduSwitchingPools; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODTU4TsAllocated; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.TerminationPoint1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.SwitchingPools; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.If100GEODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.If10GEODU2e; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.If1GEODU0; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.IfOCHOTU4ODU4; +import org.opendaylight.transportpce.common.StringConstants; +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.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPools; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; +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.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODTU4TsAllocated; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODTUCnTs; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.SwitchingPools; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GEODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GEODU2e; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If1GEODU0; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU4ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOtsiOtsigroup; 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.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; @@ -53,6 +60,9 @@ public class PceOtnNode implements PceNode { private final String pceNodeType; private final String otnServiceType; private String modeType; + // TODO: not adding state check in this class as otn topology has not been modified + private final AdminStates adminStates; + private final State state; private Map> tpAvailableTribPort = new TreeMap<>(); private Map> tpAvailableTribSlot = new TreeMap<>(); @@ -80,6 +90,10 @@ public class PceOtnNode implements PceNode { this.usedXpdrClientTps.clear(); this.availableXpdrClientTps = new ArrayList<>(); this.usableXpdrClientTps = new ArrayList<>(); + 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(); this.tpAvailableTribPort.clear(); checkAvailableTribPort(); this.tpAvailableTribSlot.clear(); @@ -110,50 +124,63 @@ public class PceOtnNode implements PceNode { for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network .node.TerminationPoint tp : allTps) { - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.@Nullable TerminationPoint1 ocnTp1 - = tp.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.@Nullable TerminationPoint1 ocnTp1 + = tp.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 .TerminationPoint1.class); //TODO many nested if-structures below, this needs to be reworked - if (OpenroadmTpType.XPONDERNETWORK.equals(ocnTp1.getTpType()) && this.otnServiceType.equals("ODU4")) { + if (OpenroadmTpType.XPONDERNETWORK.equals(ocnTp1.getTpType())) { TerminationPoint1 ontTp1; if (tp.augmentation(TerminationPoint1.class) != null) { ontTp1 = tp.augmentation(TerminationPoint1.class); } else { continue; } - if (checkTpForOdtuTermination(ontTp1)) { - LOG.info("TP {} of XPONDER {} is validated", tp.getTpId(), node.getNodeId().getValue()); - this.availableXpdrNWTps.add(tp.getTpId()); - } else { - LOG.error("TP {} of {} does not allow ODU4 termination creation", tp.getTpId().getValue(), - node.getNodeId().getValue()); - } - } else if (OpenroadmTpType.XPONDERNETWORK.equals(ocnTp1.getTpType()) - && (this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE"))) { - TerminationPoint1 ontTp1; - if (tp.augmentation(TerminationPoint1.class) != null) { - ontTp1 = tp.augmentation(TerminationPoint1.class); - } else { - continue; - } - if ("10GE".equals(otnServiceType) && checkOdtuTTPforLoOduCreation(ontTp1, 10) - || "1GE".equals(otnServiceType) && checkOdtuTTPforLoOduCreation(ontTp1, 1)) { - LOG.info("TP {} of XPONDER {} is validated", tp.getTpId(), node.getNodeId().getValue()); - this.availableXpdrNWTps.add(tp.getTpId()); - } else { - if ("10GE".equals(otnServiceType)) { - LOG.error("TP {} of {} does not allow OD2e termination creation", tp.getTpId().getValue(), - node.getNodeId().getValue()); - } else if ("1GE".equals(otnServiceType)) { - LOG.error("TP {} of {} does not allow ODU0 termination creation", tp.getTpId().getValue(), - node.getNodeId().getValue()); - } else { - LOG.error("TP {} of {} does not allow any termination creation", tp.getTpId().getValue(), - node.getNodeId().getValue()); - } + switch (this.otnServiceType) { + case StringConstants.SERVICE_TYPE_100GE_S: + // TODO verify the capability of network port to support ODU4 CTP interface creation + case StringConstants.SERVICE_TYPE_ODU4: + case StringConstants.SERVICE_TYPE_ODUC4: + if (!checkTpForOdtuTermination(ontTp1)) { + LOG.error("TP {} of {} does not allow ODU4 termination creation", + tp.getTpId().getValue(), node.getNodeId().getValue()); + continue; + } + break; + + case StringConstants.SERVICE_TYPE_10GE: + if (!checkOdtuTTPforLoOduCreation(ontTp1, 10)) { + LOG.error("TP {} of {} does not allow OD2e termination creation", + tp.getTpId().getValue(), node.getNodeId().getValue()); + continue; + } + break; + case StringConstants.SERVICE_TYPE_100GE_M: + if (!checkOdtuTTPforLoOduCreation(ontTp1, 20)) { + LOG.error("TP {} of {} does not allow ODU4 termination creation", + tp.getTpId().getValue(), node.getNodeId().getValue()); + continue; + } + break; + case StringConstants.SERVICE_TYPE_1GE: + if (!checkOdtuTTPforLoOduCreation(ontTp1, 1)) { + LOG.error("TP {} of {} does not allow ODU0 termination creation", + tp.getTpId().getValue(), node.getNodeId().getValue()); + continue; + } + break; + + default: + LOG.error("TP {} of {} does not allow any termination creation", + tp.getTpId().getValue(), node.getNodeId().getValue()); + continue; } + LOG.info("TP {} of XPONDER {} is validated", tp.getTpId(), node.getNodeId().getValue()); + this.availableXpdrNWTps.add(tp.getTpId()); } else if (OpenroadmTpType.XPONDERCLIENT.equals(ocnTp1.getTpType()) - && (this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE"))) { + && (StringConstants.SERVICE_TYPE_10GE.equals(this.otnServiceType) + || StringConstants.SERVICE_TYPE_100GE_M.equals(this.otnServiceType) + || StringConstants.SERVICE_TYPE_100GE_S.equals(this.otnServiceType) + || StringConstants.SERVICE_TYPE_1GE.equals(this.otnServiceType))) { TerminationPoint1 ontTp1; if (tp.augmentation(TerminationPoint1.class) != null) { ontTp1 = tp.augmentation(TerminationPoint1.class); @@ -170,11 +197,19 @@ public class PceOtnNode implements PceNode { } } - if ((this.otnServiceType.equals("ODU4") && mode.equals("AZ")) - || ((this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE")) + if ((StringConstants.SERVICE_TYPE_ODU4.equals(this.otnServiceType) + || StringConstants.SERVICE_TYPE_ODUC4.equals(this.otnServiceType)) + || ((StringConstants.SERVICE_TYPE_10GE.equals(this.otnServiceType) + || StringConstants.SERVICE_TYPE_100GE_M.equals(this.otnServiceType) + || StringConstants.SERVICE_TYPE_1GE.equals(this.otnServiceType)) && ((mode.equals("AZ") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 1, 1)) || (mode.equals("intermediate") && checkSwPool(null, availableXpdrNWTps, 0, 2))) - )) { + ) + || (StringConstants.SERVICE_TYPE_100GE_S.equals(this.otnServiceType) + && (mode.equals("AZ") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 1, 1))) + || (StringConstants.SERVICE_TYPE_100GE_S.equals(this.otnServiceType) + && (mode.equals("intermediate") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 0, 2))) + ) { this.valid = true; } else { this.valid = false; @@ -204,7 +239,7 @@ public class PceOtnNode implements PceNode { } } - if (clientTps == null && netwTps != null && nbClient == 0 && nbNetw == 2) { + if (netwTps != null && nbClient == 0 && nbNetw == 2) { netwTps.sort(Comparator.comparing(TpId::getValue)); @Nullable List nblList = new ArrayList<>(node.augmentation(Node1.class).getSwitchingPools() @@ -226,9 +261,10 @@ public class PceOtnNode implements PceNode { private boolean checkTpForOdtuTermination(TerminationPoint1 ontTp1) { for (SupportedInterfaceCapability sic : ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability() .values()) { - LOG.debug("in checkTpForOduTermination - sic = {}", sic.getIfCapType()); - if (sic.getIfCapType().equals(IfOCHOTU4ODU4.class) - && ontTp1.getXpdrTpPortConnectionAttributes().getTsPool() == null) { + LOG.info("in checkTpForOduTermination - sic = {}", sic.getIfCapType()); + if ((sic.getIfCapType().equals(IfOCHOTU4ODU4.class) || sic.getIfCapType().equals(IfOtsiOtsigroup.class)) + && (ontTp1.getXpdrTpPortConnectionAttributes() == null + || ontTp1.getXpdrTpPortConnectionAttributes().getTsPool() == null)) { return true; } } @@ -236,18 +272,19 @@ public class PceOtnNode implements PceNode { } private boolean checkOdtuTTPforLoOduCreation(TerminationPoint1 ontTp1, int tsNb) { - if (ontTp1.getXpdrTpPortConnectionAttributes() != null + return (ontTp1.getXpdrTpPortConnectionAttributes() != null && ontTp1.getXpdrTpPortConnectionAttributes().getTsPool() != null && ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool() != null - && ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().values() + && (ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().values() .stream().findFirst().get().getOdtuType() .equals(ODTU4TsAllocated.class) + || + ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().values() + .stream().findFirst().get().getOdtuType() + .equals(ODTUCnTs.class)) && !ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().values() .stream().findFirst().get().getTpnPool().isEmpty() - && (ontTp1.getXpdrTpPortConnectionAttributes().getTsPool().size() >= tsNb)) { - return true; - } - return false; + && (ontTp1.getXpdrTpPortConnectionAttributes().getTsPool().size() >= tsNb)); } private boolean checkClientTp(TerminationPoint1 ontTp1) { @@ -255,18 +292,20 @@ public class PceOtnNode implements PceNode { .values()) { LOG.debug("in checkTpForOduTermination - sic = {}", sic.getIfCapType()); switch (otnServiceType) { - case "1GE": + case StringConstants.SERVICE_TYPE_1GE: // we could also check the administrative status of the tp if (sic.getIfCapType().equals(If1GEODU0.class)) { return true; } break; - case "10GE": + case StringConstants.SERVICE_TYPE_10GE: if (sic.getIfCapType().equals(If10GEODU2e.class)) { return true; } break; - case "100GE": + case StringConstants.SERVICE_TYPE_100GE_T: + case StringConstants.SERVICE_TYPE_100GE_M: + case StringConstants.SERVICE_TYPE_100GE_S: if (sic.getIfCapType().equals(If100GEODU4.class)) { return true; } @@ -282,11 +321,10 @@ public class PceOtnNode implements PceNode { if (!isValid()) { return; } - if (OpenroadmNodeType.SWITCH.equals(this.nodeType)) { - initXndrTps("intermediate"); - } if (this.nodeId.getValue().equals(anodeId) || (this.nodeId.getValue().equals(znodeId))) { initXndrTps("AZ"); + } else if (OpenroadmNodeType.SWITCH.equals(this.nodeType)) { + initXndrTps("intermediate"); } else { LOG.info("validateAZxponder: XPONDER is ignored == {}", nodeId.getValue()); valid = false; @@ -302,9 +340,9 @@ public class PceOtnNode implements PceNode { if (this.nodeType != OpenroadmNodeType.TPDR) { return true; } - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1 node1 = + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Node1 node1 = node.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1.class); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Node1.class); SwitchingPools sp = node1.getSwitchingPools(); List osp = new ArrayList<>(sp.nonnullOduSwitchingPools().values()); for (OduSwitchingPools ospx : osp) { @@ -347,14 +385,17 @@ public class PceOtnNode implements PceNode { .getTerminationPoint().values().stream() .filter(type -> type .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1.class) .getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) .collect(Collectors.toList()); for (TerminationPoint tp : networkTpList) { - if (tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getOdtuTpnPool() != null - && tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getOdtuTpnPool() - .values().stream().findFirst().get().getOdtuType().equals(ODTU4TsAllocated.class)) { + if (tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() != null + && tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getOdtuTpnPool() != null + && (tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getOdtuTpnPool() + .values().stream().findFirst().get().getOdtuType().equals(ODTU4TsAllocated.class) + || tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getOdtuTpnPool() + .values().stream().findFirst().get().getOdtuType().equals(ODTUCnTs.class))) { @Nullable List tpnPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst().get().getTpnPool(); @@ -371,12 +412,13 @@ public class PceOtnNode implements PceNode { .getTerminationPoint().values().stream() .filter(type -> type .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1.class) .getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) .collect(Collectors.toList()); for (TerminationPoint tp : networkTpList) { - if (tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getTsPool() != null) { + if (tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() != null + && tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getTsPool() != null) { @Nullable List tsPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() .getTsPool(); @@ -418,16 +460,15 @@ public class PceOtnNode implements PceNode { } //Todo refactor Strings (mode and otnServiceType ) to enums - if ((pceOtnNode.otnServiceType.equals("ODU4") && pceOtnNode.modeType.equals("AZ"))) { - return true; - } - - if ((pceOtnNode.otnServiceType.equals("10GE") || pceOtnNode.otnServiceType.equals("1GE")) - && (isAz(pceOtnNode) || isIntermediate(pceOtnNode))) { + if ((pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_ODU4) + && pceOtnNode.modeType.equals("AZ"))) { return true; } - return false; + return ((pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_10GE) + || pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_1GE) + || pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_100GE_S)) + && (isAz(pceOtnNode) || isIntermediate(pceOtnNode))); } private boolean isIntermediate(PceOtnNode pceOtnNode) { @@ -456,6 +497,16 @@ public class PceOtnNode implements PceNode { return outgoingLinks; } + @Override + public AdminStates getAdminStates() { + return adminStates; + } + + @Override + public State getState() { + return state; + } + @Override public String getXpdrClient(String tp) { return this.clientPerNwTp.get(tp); @@ -518,8 +569,40 @@ public class PceOtnNode implements PceNode { return false; } + /* + * (non-Javadoc) + * + * @see org.opendaylight.transportpce.pce.networkanalyzer.PceNode#getVersion() + */ @Override - public boolean checkWL(long index) { - return false; + public String getVersion() { + // TODO Auto-generated method stub + return null; + } + + @Override + public BitSet getBitSetData() { + // TODO Auto-generated method stub + return null; + } + + /* + * (non-Javadoc) + * + * @see org.opendaylight.transportpce.pce.networkanalyzer.PceNode#getSlotWidthGranularity() + */ + @Override + public BigDecimal getSlotWidthGranularity() { + return null; + } + + /* + * (non-Javadoc) + * + * @see org.opendaylight.transportpce.pce.networkanalyzer.PceNode#getCentralFreqGranularity() + */ + @Override + public BigDecimal getCentralFreqGranularity() { + return null; } }