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=ebeb5e577e41d4da2fea656547938e334258bbb1;hb=6fec1442e9500547a98c8954a0fd8c11ab678323;hp=3ef3cf2fbb37a30e4fa7682e21403f9b881b5225;hpb=c2a7990d648d10fd9c5688e717998e0d633fe663;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 3ef3cf2fb..ebeb5e577 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 @@ -29,7 +29,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev20032 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.otn.network.topology.rev200529.networks.network.node.termination.point.XpdrTpPortConnectionAttributes; 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; @@ -102,7 +101,12 @@ public class PceOtnNode implements PceNode { private Map clientPerNwTp = new HashMap<>(); private String clientPort; - public PceOtnNode(Node node, OpenroadmNodeType nodeType, NodeId nodeId, String pceNodeType, String serviceType, + public PceOtnNode( + Node node, + OpenroadmNodeType nodeType, + NodeId nodeId, + String pceNodeType, + String serviceType, String clientPort) { this.node = node; this.nodeId = nodeId; @@ -127,7 +131,10 @@ public class PceOtnNode implements PceNode { this.tpAvailableTribSlot.clear(); checkAvailableTribSlot(); this.clientPort = clientPort; - if (node == null || nodeId == null || nodeType == null || !VALID_NODETYPES_LIST.contains(nodeType)) { + 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; } @@ -155,58 +162,49 @@ public class PceOtnNode implements PceNode { return; } for (TerminationPoint tp : allTps) { - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1 ocnTp1 - = tp.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 + .TerminationPoint1 ocnTp1 + = tp.augmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 .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: - if (tp.augmentation(TerminationPoint1.class) == null) { - continue; - } - TerminationPoint1 ontTp1 = tp.augmentation(TerminationPoint1.class); - 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)) { - LOG.error("TP {} of {} does not allow ODU4 termination creation", - tp.getTpId().getValue(), node.getNodeId().getValue()); - continue; - } - } else if (SERVICE_TYPE_ETH_TS_NB_MAP.containsKey(this.otnServiceType)) { - if (!checkOdtuTTPforLoOduCreation( - ontTp1, SERVICE_TYPE_ETH_TS_NB_MAP.get(this.otnServiceType))) { - LOG.error("TP {} of {} does not allow {} termination creation", - tp.getTpId().getValue(), - SERVICE_TYPE_ETH_ODU_STRING_MAP.get(this.otnServiceType), - node.getNodeId().getValue()); - continue; - } + String notCreatedServiceType = xpdrNetTpCreation(ontTp1); + if (notCreatedServiceType == null) { + 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 any termination creation", - tp.getTpId().getValue(), node.getNodeId().getValue()); - continue; + LOG.error("TP {} of {} does not allow {} termination creation", + tp.getTpId().getValue(), + node.getNodeId().getValue(), + notCreatedServiceType); } - LOG.info("TP {} of XPONDER {} is validated", tp.getTpId(), node.getNodeId().getValue()); - this.availableXpdrNWTps.add(tp.getTpId()); break; case XPONDERCLIENT: - if (SERVICE_TYPE_ETH_CLASS_MAP.containsKey(otnServiceType)) { - if (tp.augmentation(TerminationPoint1.class) == null) { - continue; - } - if (checkClientTp(tp.augmentation(TerminationPoint1.class))) { - 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()); - } + 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 lo-ODU (ODU2e or ODU0) termination creation", + tp.getTpId().getValue(), + node.getNodeId().getValue()); } break; @@ -214,13 +212,40 @@ public class PceOtnNode implements PceNode { LOG.debug("unsupported ocn TP type {}", ocnTp1.getTpType()); } } - this.valid = SERVICE_TYPE_ODU_LIST.contains(this.otnServiceType) - || SERVICE_TYPE_ETH_CLASS_MAP.containsKey(this.otnServiceType) - && checkSwPool(availableXpdrNWTps, availableXpdrClientTps); + this.valid = checkSwPool(availableXpdrNWTps, availableXpdrClientTps); + } + + 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 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; } @@ -240,39 +265,14 @@ public class PceOtnNode implements PceNode { switch (modeType) { case "intermediate": - for (NonBlockingList nbl: nblList) { - for (TpId nwTp : netwTps) { - if (nbl.getTpList().contains(nwTp)) { - usableXpdrNWTps.add(nwTp); - } - if (usableXpdrNWTps.size() >= 2) { - return true; - } - } - } - return false; + return checkIntermediateSwPool(nblList, netwTps); case "AZ": if (clientTps == null) { return false; } clientTps.sort(Comparator.comparing(TpId::getValue)); - 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 (usableXpdrClientTps.size() >= 1 && usableXpdrNWTps.size() >= 1 - && (this.clientPort == null || this.clientPort.equals(clTp.getValue()))) { - clientPerNwTp.put(nwTp.getValue(), clTp.getValue()); - return true; - } - } - } - } - return false; + return checkAzSwPool(nblList, netwTps, clientTps); default: LOG.error("Unsupported mode type {}", modeType); @@ -280,13 +280,50 @@ public class PceOtnNode implements PceNode { } } + + private boolean checkIntermediateSwPool(List nblList, List netwTps) { + for (NonBlockingList nbl: nblList) { + for (TpId nwTp : netwTps) { + if (nbl.getTpList().contains(nwTp)) { + usableXpdrNWTps.add(nwTp); + } + if (usableXpdrNWTps.size() >= 2) { + return true; + } + } + } + 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 (usableXpdrClientTps.size() >= 1 + && usableXpdrNWTps.size() >= 1 + && (this.clientPort == null || this.clientPort.equals(clTp.getValue()))) { + clientPerNwTp.put(nwTp.getValue(), clTp.getValue()); + return true; + } + } + } + } + return false; + } + private boolean checkTpForOdtuTermination(TerminationPoint1 ontTp1) { - for (SupportedInterfaceCapability sic : ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability() - .values()) { + 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)) { + && (ontTp1.getXpdrTpPortConnectionAttributes() == null + || ontTp1.getXpdrTpPortConnectionAttributes().getTsPool() == null)) { return true; } } @@ -311,12 +348,11 @@ public class PceOtnNode implements PceNode { } private boolean checkClientTp(TerminationPoint1 ontTp1) { - for (SupportedInterfaceCapability sic : ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability() - .values()) { + for (SupportedInterfaceCapability sic : + ontTp1.getTpSupportedInterfaces().getSupportedInterfaceCapability().values()) { LOG.debug("in checkTpForOduTermination - sic = {}", sic.getIfCapType()); // we could also check the administrative status of the tp - if (SERVICE_TYPE_ETH_CLASS_MAP.containsKey(otnServiceType) - && sic.getIfCapType().equals(SERVICE_TYPE_ETH_CLASS_MAP.get(otnServiceType))) { + if (sic.getIfCapType().equals(SERVICE_TYPE_ETH_CLASS_MAP.get(otnServiceType))) { return true; } } @@ -327,7 +363,8 @@ public class PceOtnNode implements PceNode { if (!isValid()) { return; } - if (this.nodeId.getValue().equals(anodeId) || (this.nodeId.getValue().equals(znodeId))) { + if (this.nodeId.getValue().equals(anodeId) + || (this.nodeId.getValue().equals(znodeId))) { initXndrTps("AZ"); } else if (OpenroadmNodeType.SWITCH.equals(this.nodeType)) { initXndrTps("intermediate"); @@ -341,14 +378,15 @@ public class PceOtnNode implements PceNode { if (this.nodeType != OpenroadmNodeType.TPDR) { return true; } - Node1 node1 = node.augmentation(Node1.class); - SwitchingPools sp = node1.getSwitchingPools(); - List osp = new ArrayList<>(sp.nonnullOduSwitchingPools().values()); - for (OduSwitchingPools ospx : osp) { - 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())) { + 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; @@ -403,11 +441,13 @@ public class PceOtnNode implements PceNode { public void checkAvailableTribSlot() { for (TerminationPoint tp : node.augmentation( - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class) + 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.rev200529.TerminationPoint1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 + .TerminationPoint1.class) .getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) .collect(Collectors.toList()) ) { @@ -420,8 +460,10 @@ public class PceOtnNode implements PceNode { } public boolean isValid() { - if (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; }