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=931b621f82a9b893183f1a5fcfd3a37d0068a6f4;hb=7e175bf72bc28db4299b1fd76e6d01bdb0854d0f;hp=93e760e9f53397a5c03364b24546ed368a7c219f;hpb=ffb163d752367b42b30ecb1cdcb87b293851f04f;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 93e760e9f..931b621f8 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 @@ -9,6 +9,7 @@ package org.opendaylight.transportpce.pce.networkanalyzer; import java.util.ArrayList; +import java.util.BitSet; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -16,19 +17,20 @@ 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.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; @@ -101,20 +103,21 @@ public class PceOtnNode implements PceNode { = 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 + 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); @@ -129,22 +132,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 { @@ -153,7 +159,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); @@ -170,8 +177,9 @@ 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) && 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))) )) { @@ -188,8 +196,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); @@ -207,8 +215,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)) { @@ -224,7 +232,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) { @@ -238,9 +247,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; } @@ -248,21 +259,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; } @@ -298,13 +310,13 @@ 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 = 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())) { @@ -340,20 +352,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); } @@ -364,10 +376,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()); @@ -414,11 +426,13 @@ public class PceOtnNode implements PceNode { } //Todo refactor Strings (mode and otnServiceType ) to enums - if ((pceOtnNode.otnServiceType.equals("ODU4") && pceOtnNode.modeType.equals("AZ"))) { + if ((pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_ODU4) + && pceOtnNode.modeType.equals("AZ"))) { return true; } - if ((pceOtnNode.otnServiceType.equals("10GE") || pceOtnNode.otnServiceType.equals("1GE")) + if ((pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_10GE) + || pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_1GE)) && (isAz(pceOtnNode) || isIntermediate(pceOtnNode))) { return true; } @@ -514,8 +528,20 @@ 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; } }