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=b4f2d16fe85bb7190da8aa0a599ecfd5e6784a62;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;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..b4f2d16fe 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,27 +8,35 @@ 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; 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.rev201211.xpdr.odu.switching.pools.OduSwitchingPools; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; +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.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.rev211210.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.networks.network.node.termination.point.XpdrTpPortConnectionAttributes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If100GEODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GEODU2e; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If1GEODU0; +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.xponder.rev211210.xpdr.otn.tp.attributes.OdtuTpnPool; 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; @@ -38,13 +46,37 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PceOtnNode implements PceNode { - /* Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(PceOtnNode.class); ////////////////////////// OTN NODES /////////////////////////// /* * For This Class the node passed shall be at the otn-openroadm Layer */ + private static final Logger LOG = LoggerFactory.getLogger(PceOtnNode.class); + private static final List SERVICE_TYPE_ODU_LIST = List.of( + StringConstants.SERVICE_TYPE_ODU4, + StringConstants.SERVICE_TYPE_ODUC4, + StringConstants.SERVICE_TYPE_ODUC3, + StringConstants.SERVICE_TYPE_ODUC2); + private static final List VALID_NODETYPES_LIST = List.of( + OpenroadmNodeType.MUXPDR, + OpenroadmNodeType.SWITCH, + OpenroadmNodeType.TPDR); + private static final Map> SERVICE_TYPE_ETH_CLASS_MAP = Map.of( + StringConstants.SERVICE_TYPE_1GE, If1GEODU0.class, + StringConstants.SERVICE_TYPE_10GE, If10GEODU2e.class, + StringConstants.SERVICE_TYPE_100GE_M, If100GEODU4.class, + StringConstants.SERVICE_TYPE_100GE_S, If100GEODU4.class); + private static final Map SERVICE_TYPE_ETH_TS_NB_MAP = Map.of( + StringConstants.SERVICE_TYPE_1GE, 1, + StringConstants.SERVICE_TYPE_10GE, 10, + StringConstants.SERVICE_TYPE_100GE_M, 20); + private static final Map SERVICE_TYPE_ETH_ODU_STRING_MAP = Map.of( + StringConstants.SERVICE_TYPE_1GE, "ODU0", + StringConstants.SERVICE_TYPE_10GE, "ODU2e", + StringConstants.SERVICE_TYPE_100GE_M, "ODU4"); + private static final String INTERMEDIATE_MODETYPE = "intermediate"; + private static final String AZ_MODETYPE = "AZ"; + private boolean valid = true; private final Node node; @@ -52,6 +84,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<>(); @@ -65,8 +101,15 @@ public class PceOtnNode implements PceNode { private List outgoingLinks = new ArrayList<>(); private Map clientPerNwTp = new HashMap<>(); - - public PceOtnNode(Node node, OpenroadmNodeType nodeType, NodeId nodeId, String pceNodeType, String serviceType) { + private String clientPort; + + public PceOtnNode( + Node node, + OpenroadmNodeType nodeType, + NodeId nodeId, + String pceNodeType, + String serviceType, + String clientPort) { this.node = node; this.nodeId = nodeId; this.nodeType = nodeType; @@ -79,139 +122,194 @@ 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.rev211210.Node1.class) + .getAdministrativeState(); + this.state = node + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1.class) + .getOperationalState(); this.tpAvailableTribPort.clear(); checkAvailableTribPort(); this.tpAvailableTribSlot.clear(); checkAvailableTribSlot(); - if ((node == null) || (nodeId == null) || (nodeType != OpenroadmNodeType.MUXPDR) - && (nodeType != OpenroadmNodeType.SWITCH) && (nodeType != OpenroadmNodeType.TPDR)) { + this.clientPort = clientPort; + if (node == null + || nodeId == null + || nodeType == null + || !VALID_NODETYPES_LIST.contains(nodeType)) { LOG.error("PceOtnNode: one of parameters is not populated : nodeId, node type"); this.valid = false; } + if (!SERVICE_TYPE_ETH_CLASS_MAP.containsKey(serviceType) + && !SERVICE_TYPE_ODU_LIST.contains(serviceType)) { + LOG.error("PceOtnNode: unsupported OTN Service Type {}", serviceType); + this.valid = false; + } } public void initXndrTps(String mode) { LOG.info("PceOtnNode: initXndrTps for node {}", this.nodeId.getValue()); this.availableXponderTp.clear(); - - 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(); + this.modeType = mode; + List allTps = + new ArrayList<>( + this.node.augmentation( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .Node1.class) + .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 - .TerminationPoint1.class); - //TODO many nested if-structures below, this needs to be reworked - if (OpenroadmTpType.XPONDERNETWORK.equals(ocnTp1.getTpType()) && this.otnServiceType.equals("ODU4")) { - 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(), + for (TerminationPoint tp : allTps) { + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 + .TerminationPoint1 ocnTp1 + = tp.augmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 + .TerminationPoint1.class); + if (ocnTp1 == null) { + LOG.warn("null ocn TP {}", tp); + continue; + } + TerminationPoint1 ontTp1 = tp.augmentation(TerminationPoint1.class); + if (ontTp1 == null) { + continue; + } + //TODO many nested structures below, this needs to be reworked + switch (ocnTp1.getTpType()) { + case XPONDERNETWORK: + String notCreatedServiceType = xpdrNetTpCreation(ontTp1); + if (notCreatedServiceType == null) { + LOG.info("TP {} of XPONDER {} is validated", + tp.getTpId().getValue(), node.getNodeId().getValue()); - } else if ("1GE".equals(otnServiceType)) { - LOG.error("TP {} of {} does not allow ODU0 termination creation", tp.getTpId().getValue(), + this.availableXpdrNWTps.add(tp.getTpId()); + } else { + LOG.error("TP {} of {} does not allow {} termination creation", + tp.getTpId().getValue(), + node.getNodeId().getValue(), + notCreatedServiceType); + } + break; + case XPONDERCLIENT: + if (!SERVICE_TYPE_ETH_CLASS_MAP.containsKey(this.otnServiceType)) { + continue; + } + if (checkClientTp(ontTp1)) { + LOG.info("TP {} of XPONDER {} is validated", + tp.getTpId(), node.getNodeId().getValue()); + this.availableXpdrClientTps.add(tp.getTpId()); } else { - LOG.error("TP {} of {} does not allow any termination creation", tp.getTpId().getValue(), + LOG.error("TP {} of {} does not allow lo-ODU (ODU2e or ODU0) termination creation", + tp.getTpId().getValue(), node.getNodeId().getValue()); } - } - } else if (OpenroadmTpType.XPONDERCLIENT.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 (checkClientTp(ontTp1)) { - LOG.info("TP {} of XPONDER {} is validated", tp.getTpId(), node.getNodeId().getValue()); - this.availableXpdrClientTps.add(tp.getTpId()); - } else { - LOG.error("TP {} of {} does not allow lo-ODU (ODU2e or ODU0) termination creation", - tp.getTpId().getValue(), node.getNodeId().getValue()); - } + break; + + default: + LOG.debug("unsupported ocn TP type {}", ocnTp1.getTpType()); } } + this.valid = checkSwPool(availableXpdrNWTps, availableXpdrClientTps); + } - 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))) { - this.valid = true; - } else { - this.valid = false; + private String xpdrNetTpCreation(TerminationPoint1 ontTp1) { + if (SERVICE_TYPE_ODU_LIST.contains(this.otnServiceType) + || StringConstants.SERVICE_TYPE_100GE_S.equals(this.otnServiceType)) { + // TODO verify the capability of network port to support ODU4 CTP interface creation + if (checkTpForOdtuTermination(ontTp1)) { + //success + return null; + } + return "ODU4"; } + if (SERVICE_TYPE_ETH_TS_NB_MAP.containsKey(this.otnServiceType)) { + if (checkOdtuTTPforLoOduCreation( + ontTp1, + SERVICE_TYPE_ETH_TS_NB_MAP.get(this.otnServiceType))) { + //success + return null; + } + return SERVICE_TYPE_ETH_ODU_STRING_MAP.get(this.otnServiceType); + } + //failure + return "any"; } - private boolean checkSwPool(List clientTps, List netwTps, int nbClient, int nbNetw) { - if (clientTps != null && netwTps != null && nbClient == 1 && nbNetw == 1) { - clientTps.sort(Comparator.comparing(TpId::getValue)); - netwTps.sort(Comparator.comparing(TpId::getValue)); + private boolean checkSwPool(List netwTps, List clientTps) { + + if (SERVICE_TYPE_ODU_LIST.contains(this.otnServiceType)) { + return true; + } + if (!SERVICE_TYPE_ETH_CLASS_MAP.containsKey(this.otnServiceType)) { + return false; + } + if (netwTps == null) { + return false; + } + Node1 node1 = node.augmentation(Node1.class); + if (node1 == null) { + return false; + } + List nblList = new ArrayList<>( + node1.getSwitchingPools().nonnullOduSwitchingPools() + .values().stream().findFirst().get() + .getNonBlockingList().values()); + if (nblList == null) { + return false; + } + netwTps.sort(Comparator.comparing(TpId::getValue)); + + switch (modeType) { + + case INTERMEDIATE_MODETYPE: + return checkIntermediateSwPool(nblList, netwTps); + + case AZ_MODETYPE: + if (clientTps == null) { + return false; + } + clientTps.sort(Comparator.comparing(TpId::getValue)); + return checkAzSwPool(nblList, netwTps, clientTps); + + default: + LOG.error("Unsupported mode type {}", modeType); + return false; + } + } + + + private boolean checkIntermediateSwPool(List nblList, List netwTps) { + for (NonBlockingList nbl: nblList) { for (TpId nwTp : netwTps) { - for (TpId clTp : clientTps) { - @Nullable - List nblList = node.augmentation(Node1.class).getSwitchingPools() - .getOduSwitchingPools().get(0).getNonBlockingList(); - for (NonBlockingList nbl : nblList) { - if (nbl.getTpList().contains(clTp) && nbl.getTpList().contains(nwTp)) { - usableXpdrClientTps.add(clTp); - usableXpdrNWTps.add(nwTp); - } - if (usableXpdrClientTps.size() >= nbClient && usableXpdrNWTps.size() >= nbNetw) { - clientPerNwTp.put(nwTp.getValue(), clTp.getValue()); - return true; - } - } + if (nbl.getTpList().contains(nwTp)) { + usableXpdrNWTps.add(nwTp); + } + if (usableXpdrNWTps.size() >= 2) { + return true; } } - } - 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(); - for (NonBlockingList nbl : nblList) { - for (TpId nwTp : netwTps) { - if (nbl.getTpList().contains(nwTp)) { + return false; + } + + + private boolean checkAzSwPool(List nblList, List netwTps, List clientTps) { + for (NonBlockingList nbl: nblList) { + for (TpId nwTp : netwTps) { + for (TpId clTp : clientTps) { + if (nbl.getTpList().contains(clTp) + && nbl.getTpList().contains(nwTp)) { + usableXpdrClientTps.add(clTp); usableXpdrNWTps.add(nwTp); } - if (usableXpdrNWTps.size() >= nbNetw) { + if (usableXpdrClientTps.size() >= 1 + && usableXpdrNWTps.size() >= 1 + && (this.clientPort == null || this.clientPort.equals(clTp.getValue()))) { + clientPerNwTp.put(nwTp.getValue(), clTp.getValue()); return true; } } @@ -221,10 +319,13 @@ public class PceOtnNode implements PceNode { } private boolean checkTpForOdtuTermination(TerminationPoint1 ontTp1) { - for (SupportedInterfaceCapability sic : ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability()) { - LOG.debug("in checkTpForOduTermination - sic = {}", sic.getIfCapType()); - if (sic.getIfCapType().equals(IfOCHOTU4ODU4.class) - && ontTp1.getXpdrTpPortConnectionAttributes().getTsPool() == null) { + for (SupportedInterfaceCapability sic : + ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability().values()) { + 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; } } @@ -232,40 +333,30 @@ public class PceOtnNode implements PceNode { } private boolean checkOdtuTTPforLoOduCreation(TerminationPoint1 ontTp1, int tsNb) { - if (ontTp1.getXpdrTpPortConnectionAttributes() != null - && ontTp1.getXpdrTpPortConnectionAttributes().getTsPool() != null - && ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool() != null - && ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().get(0).getOdtuType() - .equals(ODTU4TsAllocated.class) - && ontTp1.getXpdrTpPortConnectionAttributes().getOdtuTpnPool().get(0).getTpnPool().isEmpty() - && (ontTp1.getXpdrTpPortConnectionAttributes().getTsPool().size() >= tsNb)) { - return true; + XpdrTpPortConnectionAttributes portConAttr = ontTp1.getXpdrTpPortConnectionAttributes(); + if (portConAttr == null + || portConAttr.getTsPool() == null + || portConAttr.getTsPool().size() < tsNb + || portConAttr.getOdtuTpnPool() == null) { + return false; } - return false; + return checkFirstOdtuTpn(portConAttr.getOdtuTpnPool().values().stream().findFirst().get()); + } + + private boolean checkFirstOdtuTpn(OdtuTpnPool otPool) { + return (otPool.getOdtuType().getSimpleName().equals(ODTU4TsAllocated.class.getSimpleName()) + || otPool.getOdtuType().getSimpleName().equals(ODTUCnTs.class.getSimpleName())) + && !otPool.getTpnPool().isEmpty(); } 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": - // we could also check the administrative status of the tp - if (sic.getIfCapType().equals(If1GEODU0.class)) { - return true; - } - break; - case "10GE": - if (sic.getIfCapType().equals(If10GEODU2e.class)) { - return true; - } - break; - case "100GE": - if (sic.getIfCapType().equals(If100GEODU4.class)) { - return true; - } - break; - default: - break; + // we could also check the administrative status of the tp + if (SERVICE_TYPE_ETH_CLASS_MAP.get(otnServiceType).getSimpleName() + .equals(sic.getIfCapType().getSimpleName())) { + return true; } } return false; @@ -275,47 +366,39 @@ 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"); + if (this.nodeId.getValue().equals(anodeId) + || (this.nodeId.getValue().equals(znodeId))) { + initXndrTps(AZ_MODETYPE); + } else if (OpenroadmNodeType.SWITCH.equals(this.nodeType)) { + initXndrTps(INTERMEDIATE_MODETYPE); } else { LOG.info("validateAZxponder: XPONDER is ignored == {}", nodeId.getValue()); valid = false; } } - public boolean validateSwitchingPoolBandwidth( - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .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, - Long neededBW) { + public boolean validateSwitchingPoolBandwidth(TerminationPoint tp1, 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 = - node.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1.class); - SwitchingPools sp = node1.getSwitchingPools(); - List osp = sp.getOduSwitchingPools(); - for (OduSwitchingPools ospx : osp) { - List nbl = ospx.getNonBlockingList(); - for (NonBlockingList nbll : nbl) { - if (nbll.getAvailableInterconnectBandwidth().toJava() >= neededBW && nbll.getTpList() != null - && nbll.getTpList().contains(tp1.getTpId()) && nbll.getTpList().contains(tp2.getTpId())) { + for (OduSwitchingPools ospx : + node.augmentation(Node1.class) + .getSwitchingPools() + .nonnullOduSwitchingPools().values()) { + for (NonBlockingList nbll : ospx.nonnullNonBlockingList().values()) { + if (nbll.getAvailableInterconnectBandwidth().toJava() >= neededBW + && nbll.getTpList() != null + && nbll.getTpList().contains(tp1.getTpId()) + && nbll.getTpList().contains(tp2.getTpId())) { LOG.debug("validateSwitchingPoolBandwidth: couple of tp {} x {} valid for crossconnection", tp1.getTpId(), tp2.getTpId()); return true; } } } - LOG.debug("validateSwitchingPoolBandwidth: No valid Switching pool for crossconnecting tp {} and {}", tp1.getTpId(), tp2.getTpId()); return false; - } public void validateIntermediateSwitch() { @@ -326,61 +409,64 @@ public class PceOtnNode implements PceNode { return; } // Validate switch for use as an intermediate XPONDER on the path - initXndrTps("intermediate"); - if (!this.valid) { - LOG.debug("validateIntermediateSwitch: Switch unusable for transit == {}", nodeId.getValue()); - } else { + initXndrTps(INTERMEDIATE_MODETYPE); + if (this.valid) { LOG.info("validateIntermediateSwitch: Switch usable for transit == {}", nodeId.getValue()); + } else { + LOG.debug("validateIntermediateSwitch: Switch unusable for transit == {}", nodeId.getValue()); } } 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() - .filter(type -> type - .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.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)) { - @Nullable - List tpnPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() - .getOdtuTpnPool().get(0).getTpnPool(); - if (tpnPool != null) { - tpAvailableTribPort.put(tp.getTpId().getValue(), tpnPool); + for (TerminationPoint tp : + node.augmentation( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .Node1.class) + .getTerminationPoint().values().stream() + .filter(type -> type + .augmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 + .TerminationPoint1.class) + .getTpType() + .equals(OpenroadmTpType.XPONDERNETWORK)) + .collect(Collectors.toList())) { + XpdrTpPortConnectionAttributes portConAttr = + tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes(); + if (portConAttr != null && portConAttr.getOdtuTpnPool() != null) { + OdtuTpnPool otPool = portConAttr.getOdtuTpnPool().values().stream().findFirst().get(); + if (checkFirstOdtuTpn(otPool)) { + tpAvailableTribPort.put(tp.getTpId().getValue(), otPool.getTpnPool()); } } } } 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() + for (TerminationPoint tp : + node.augmentation( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .Node1.class) + .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.rev211210 + .TerminationPoint1.class) .getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) - .collect(Collectors.toList()); - - for (TerminationPoint tp : networkTpList) { - if (tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes().getTsPool() != null) { - @Nullable - List tsPool = tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes() - .getTsPool(); - tpAvailableTribSlot.put(tp.getTpId().getValue(), tsPool); + .collect(Collectors.toList()) + ) { + XpdrTpPortConnectionAttributes portConAttr = + tp.augmentation(TerminationPoint1.class).getXpdrTpPortConnectionAttributes(); + if (portConAttr != null && portConAttr.getTsPool() != null) { + tpAvailableTribSlot.put(tp.getTpId().getValue(), portConAttr.getTsPool()); } } } public boolean isValid() { - if ((node == null) || (nodeId == null) || (nodeType == null) || (this.getSupNetworkNodeId() == null) - || (this.getSupClliNodeId() == null)) { + if (nodeId == null + || nodeType == null + || this.getSupNetworkNodeId() == null + || this.getSupClliNodeId() == null) { LOG.error("PceNode: one of parameters is not populated : nodeId, node type, supporting nodeId"); valid = false; } @@ -397,6 +483,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); @@ -445,7 +541,7 @@ public class PceOtnNode implements PceNode { } @Override - public String getRdmSrgClient(String tp) { + public String getRdmSrgClient(String tp, String direction) { return null; } @@ -459,8 +555,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; } }