X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceOtnNode.java;h=736539d9404ed7b3289b607f566d6d2db1f4573d;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=bda495cfa1727d9b69c7e3735422e73e23d76104;hpb=767266b4daf54646e022f17d7f9674e929081583;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 bda495cfa..736539d94 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,22 @@ 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.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.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; @@ -52,6 +57,10 @@ public class PceOtnNode implements PceNode { private final OpenroadmNodeType nodeType; 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<>(); @@ -79,6 +88,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(); @@ -94,24 +107,27 @@ public class PceOtnNode implements PceNode { LOG.info("PceOtnNode: initXndrTps for node {}", this.nodeId.getValue()); this.availableXponderTp.clear(); + this.modeType = mode; + 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 = nodeTp.getTerminationPoint(); + .node.TerminationPoint> allTps = new ArrayList<>(nodeTp.nonnullTerminationPoint().values()); this.valid = false; - if (allTps == null) { + if (allTps.isEmpty()) { LOG.error("PceOtnNode: initXndrTps: XPONDER TerminationPoint list is empty for node {}", this); return; } 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 + .node.TerminationPoint tp : allTps) { + 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()) + && StringConstants.SERVICE_TYPE_ODU4.equals(this.otnServiceType)) { TerminationPoint1 ontTp1; if (tp.augmentation(TerminationPoint1.class) != null) { ontTp1 = tp.augmentation(TerminationPoint1.class); @@ -126,22 +142,25 @@ public class PceOtnNode implements PceNode { node.getNodeId().getValue()); } } else if (OpenroadmTpType.XPONDERNETWORK.equals(ocnTp1.getTpType()) - && (this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE"))) { + && (this.otnServiceType.equals(StringConstants.SERVICE_TYPE_10GE) + || StringConstants.SERVICE_TYPE_1GE.equals(this.otnServiceType))) { 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)) { + if (StringConstants.SERVICE_TYPE_10GE.equals(otnServiceType) + && checkOdtuTTPforLoOduCreation(ontTp1, 10) + || StringConstants.SERVICE_TYPE_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)) { + if (StringConstants.SERVICE_TYPE_10GE.equals(otnServiceType)) { LOG.error("TP {} of {} does not allow OD2e termination creation", tp.getTpId().getValue(), node.getNodeId().getValue()); - } else if ("1GE".equals(otnServiceType)) { + } else if (StringConstants.SERVICE_TYPE_1GE.equals(otnServiceType)) { LOG.error("TP {} of {} does not allow ODU0 termination creation", tp.getTpId().getValue(), node.getNodeId().getValue()); } else { @@ -150,7 +169,8 @@ public class PceOtnNode implements PceNode { } } } 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_1GE.equals(this.otnServiceType))) { TerminationPoint1 ontTp1; if (tp.augmentation(TerminationPoint1.class) != null) { ontTp1 = tp.augmentation(TerminationPoint1.class); @@ -167,11 +187,12 @@ public class PceOtnNode implements PceNode { } } - if ((this.otnServiceType.equals("ODU4") && mode.equals("AZ")) - || ((this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE")) - && mode.equals("AZ") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 1, 1)) - || ((this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE")) - && mode.equals("intermediate") && checkSwPool(null, availableXpdrNWTps, 0, 2))) { + if ((StringConstants.SERVICE_TYPE_ODU4.equals(this.otnServiceType) && mode.equals("AZ")) + || ((StringConstants.SERVICE_TYPE_10GE.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))) + )) { this.valid = true; } else { this.valid = false; @@ -185,8 +206,8 @@ public class PceOtnNode implements PceNode { for (TpId nwTp : netwTps) { for (TpId clTp : clientTps) { @Nullable - List nblList = node.augmentation(Node1.class).getSwitchingPools() - .getOduSwitchingPools().get(0).getNonBlockingList(); + List nblList = new ArrayList<>(node.augmentation(Node1.class).getSwitchingPools() + .nonnullOduSwitchingPools().values().stream().findFirst().get().getNonBlockingList().values()); for (NonBlockingList nbl : nblList) { if (nbl.getTpList().contains(clTp) && nbl.getTpList().contains(nwTp)) { usableXpdrClientTps.add(clTp); @@ -204,8 +225,8 @@ public class PceOtnNode implements PceNode { if (clientTps == null && netwTps != null && nbClient == 0 && nbNetw == 2) { netwTps.sort(Comparator.comparing(TpId::getValue)); @Nullable - List nblList = node.augmentation(Node1.class).getSwitchingPools().getOduSwitchingPools() - .get(0).getNonBlockingList(); + List nblList = new ArrayList<>(node.augmentation(Node1.class).getSwitchingPools() + .nonnullOduSwitchingPools().values().stream().findFirst().get().getNonBlockingList().values()); for (NonBlockingList nbl : nblList) { for (TpId nwTp : netwTps) { if (nbl.getTpList().contains(nwTp)) { @@ -221,7 +242,8 @@ public class PceOtnNode implements PceNode { } private boolean checkTpForOdtuTermination(TerminationPoint1 ontTp1) { - for (SupportedInterfaceCapability sic : ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability()) { + for (SupportedInterfaceCapability sic : ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability() + .values()) { LOG.debug("in checkTpForOduTermination - sic = {}", sic.getIfCapType()); if (sic.getIfCapType().equals(IfOCHOTU4ODU4.class) && ontTp1.getXpdrTpPortConnectionAttributes().getTsPool() == null) { @@ -235,9 +257,11 @@ public class PceOtnNode implements PceNode { if (ontTp1.getXpdrTpPortConnectionAttributes() != null && ontTp1.getXpdrTpPortConnectionAttributes().getTsPool() != null && ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool() != null - && ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().get(0).getOdtuType() + && ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().values() + .stream().findFirst().get().getOdtuType() .equals(ODTU4TsAllocated.class) - && ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().get(0).getTpnPool().isEmpty() + && !ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().values() + .stream().findFirst().get().getTpnPool().isEmpty() && (ontTp1.getXpdrTpPortConnectionAttributes().getTsPool().size() >= tsNb)) { return true; } @@ -245,21 +269,22 @@ public class PceOtnNode implements PceNode { } private boolean checkClientTp(TerminationPoint1 ontTp1) { - for (SupportedInterfaceCapability sic : ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability()) { + for (SupportedInterfaceCapability sic : ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability() + .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: if (sic.getIfCapType().equals(If100GEODU4.class)) { return true; } @@ -288,20 +313,20 @@ public class PceOtnNode implements PceNode { public boolean validateSwitchingPoolBandwidth( org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.network.topology.rev180226.networks.network.node.TerminationPoint tp1, + .ietf.network.topology.rev180226.networks.network.node.TerminationPoint tp1, org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.network.topology.rev180226.networks.network.node.TerminationPoint tp2, + .ietf.network.topology.rev180226.networks.network.node.TerminationPoint tp2, Long neededBW) { 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 = sp.getOduSwitchingPools(); + List osp = new ArrayList<>(sp.nonnullOduSwitchingPools().values()); for (OduSwitchingPools ospx : osp) { - List nbl = ospx.getNonBlockingList(); + List nbl = new ArrayList<>(ospx.nonnullNonBlockingList().values()); for (NonBlockingList nbll : nbl) { if (nbll.getAvailableInterconnectBandwidth().toJava() >= neededBW && nbll.getTpList() != null && nbll.getTpList().contains(tp1.getTpId()) && nbll.getTpList().contains(tp2.getTpId())) { @@ -337,20 +362,20 @@ public class PceOtnNode implements PceNode { public void checkAvailableTribPort() { List networkTpList = node.augmentation( org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class) - .getTerminationPoint().stream() + .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().get(0) - .getOdtuType().equals(ODTU4TsAllocated.class)) { + && tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getOdtuTpnPool() + .values().stream().findFirst().get().getOdtuType().equals(ODTU4TsAllocated.class)) { @Nullable List tpnPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() - .getOdtuTpnPool().get(0).getTpnPool(); + .getOdtuTpnPool().values().stream().findFirst().get().getTpnPool(); if (tpnPool != null) { tpAvailableTribPort.put(tp.getTpId().getValue(), tpnPool); } @@ -361,10 +386,10 @@ public class PceOtnNode implements PceNode { public void checkAvailableTribSlot() { List networkTpList = node.augmentation( org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class) - .getTerminationPoint().stream() + .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()); @@ -387,6 +412,60 @@ public class PceOtnNode implements PceNode { return valid; } + public boolean isPceOtnNodeValid(final PceOtnNode pceOtnNode) { + if (pceOtnNode == null || pceOtnNode.node == null + || pceOtnNode.getNodeId() == null || pceOtnNode.nodeType == null || pceOtnNode.getSupNetworkNodeId() == null + || pceOtnNode.getSupClliNodeId() == null || pceOtnNode.otnServiceType == null) { + LOG.error( + "PceOtnNode: one of parameters is not populated : nodeId, node type, supporting nodeId, otnServiceType" + ); + return false; + } + + if (!isNodeTypeValid(pceOtnNode)) { + LOG.error("PceOtnNode node type: node type isn't one of MUXPDR or SWITCH or TPDR"); + return false; + } + + return isOtnServiceTypeValid(pceOtnNode); + } + + private boolean isOtnServiceTypeValid(PceOtnNode pceOtnNode) { + if (pceOtnNode.modeType == null) { + return false; + } + + //Todo refactor Strings (mode and otnServiceType ) to enums + if ((pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_ODU4) + && pceOtnNode.modeType.equals("AZ"))) { + return true; + } + + if ((pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_10GE) + || pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_1GE)) + && (isAz(pceOtnNode) || isIntermediate(pceOtnNode))) { + return true; + } + + return false; + } + + private boolean isIntermediate(PceOtnNode pceOtnNode) { + return pceOtnNode.modeType.equals("intermediate") + && checkSwPool(null, pceOtnNode.availableXpdrNWTps, 0, 2); + } + + private boolean isAz(PceOtnNode pceOtnNode) { + return pceOtnNode.modeType.equals("AZ") + && checkSwPool(pceOtnNode.availableXpdrClientTps, pceOtnNode.availableXpdrNWTps, 1, 1); + } + + private boolean isNodeTypeValid(final PceOtnNode pceOtnNode) { + return (pceOtnNode.nodeType == OpenroadmNodeType.MUXPDR) + || (pceOtnNode.nodeType == OpenroadmNodeType.SWITCH) + || (pceOtnNode.nodeType == OpenroadmNodeType.TPDR); + } + @Override public void addOutgoingLink(PceLink outLink) { this.outgoingLinks.add(outLink); @@ -397,6 +476,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); @@ -459,8 +548,30 @@ 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; } }