X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceOpticalNode.java;h=2c94225b9598d0f2ffa6da7984a8a877242999b7;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;hp=0de4b60c41426d4003ff61d0332a82fd9e09890f;hpb=e50901c4b06c82b91f136dac09bacce01258d7b2;p=transportpce.git diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java index 0de4b60c4..2c94225b9 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java @@ -20,17 +20,19 @@ import java.util.TreeMap; import org.opendaylight.transportpce.common.fixedflex.GridConstant; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.pce.SortPortsByName; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1; 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.rev200529.Node1; -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.available.freq.map.AvailFreqMapsKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOtsiOtsigroup; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.Node1; +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.available.freq.map.AvailFreqMapsKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCH; +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.service.format.rev191129.ServiceFormat; 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.yangtools.yang.common.Uint16; @@ -84,9 +86,9 @@ public class PceOpticalNode implements PceNode { this.slotWidthGranularity = slotWidthGranularity; this.centralFreqGranularity = centralFreqGranularity; this.adminStates = node.augmentation(org.opendaylight.yang.gen.v1.http - .org.openroadm.common.network.rev200529.Node1.class).getAdministrativeState(); + .org.openroadm.common.network.rev211210.Node1.class).getAdministrativeState(); this.state = node.augmentation(org.opendaylight.yang.gen.v1.http - .org.openroadm.common.network.rev200529.Node1.class).getOperationalState(); + .org.openroadm.common.network.rev211210.Node1.class).getOperationalState(); } else { LOG.error("PceNode: one of parameters is not populated : nodeId, node type, slot width granularity"); this.valid = false; @@ -113,8 +115,8 @@ public class PceOpticalNode implements PceNode { for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network .node.TerminationPoint tp : allTps) { TerminationPoint1 cntp1 = tp.augmentation(TerminationPoint1.class); - org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1 = tp - .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1 = tp + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210 .TerminationPoint1.class); OpenroadmTpType type = cntp1.getTpType(); LOG.info("type = {} for tp {}", type.getName(), tp); @@ -157,7 +159,7 @@ public class PceOpticalNode implements PceNode { } private boolean isTerminationPointAvailable( - org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1) { + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1) { byte[] availableByteArray = new byte[GridConstant.NB_OCTECTS]; Arrays.fill(availableByteArray, (byte) GridConstant.AVAILABLE_SLOT_VALUE); return nttp1 == null || nttp1.getPpAttributes() == null @@ -177,15 +179,15 @@ public class PceOpticalNode implements PceNode { } switch (this.serviceType) { case "400GE": - if (mapping.getSupportedInterfaceCapability().contains(IfOtsiOtsigroup.class)) { - return true; - } else { - return false; + for (Class ifCap : mapping.getSupportedInterfaceCapability()) { + if (ifCap.equals(IfOtsiOtsigroup.class)) { + return true; + } } + return false; case "100GE": - if (mapping.getSupportedInterfaceCapability().contains( - org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.IfOCH.class) - || mapping.getSupportedInterfaceCapability().contains(IfOCH.class)) { + if (mapping.getSupportedInterfaceCapability().contains(IfOCH.class) + || mapping.getSupportedInterfaceCapability().contains(IfOCHOTU4ODU4.class)) { return true; } else { return false; @@ -200,8 +202,8 @@ public class PceOpticalNode implements PceNode { return; } Node1 node1 = this.node.augmentation(Node1.class); - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 node11 = - this.node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1 node11 = + this.node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1 .class); switch (this.nodeType) { case SRG : @@ -281,8 +283,8 @@ public class PceOpticalNode implements PceNode { this.valid = false; continue; } - org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1 = tp - .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1 = tp + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210 .TerminationPoint1.class); if (nttp1 != null && nttp1.getXpdrNetworkAttributes().getWavelength() != null) { this.usedXpndrNWTps.add(tp.getTpId().getValue()); @@ -292,8 +294,8 @@ public class PceOpticalNode implements PceNode { } // find Client of this network TP String client; - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.TerminationPoint1 tpceTp1 = - tp.augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511 + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1 tpceTp1 = + tp.augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123 .TerminationPoint1.class); if (tpceTp1 != null) { client = tpceTp1.getAssociatedConnectionMapPort(); @@ -311,7 +313,7 @@ public class PceOpticalNode implements PceNode { } @Override - public String getRdmSrgClient(String tp) { + public String getRdmSrgClient(String tp, String direction) { LOG.info("getRdmSrgClient: Getting PP client for tp '{}' on node : {}", tp, this.nodeId); OpenroadmTpType srgType = null; OpenroadmTpType cpType = this.availableSrgCp.get(tp); @@ -322,7 +324,16 @@ public class PceOpticalNode implements PceNode { switch (cpType) { case SRGTXRXCP: LOG.info("getRdmSrgClient: Getting BI Directional PP port ..."); - srgType = OpenroadmTpType.SRGTXRXPP; + // Take the first-element in the available PP key set + if (availableSrgPp.entrySet().iterator().next().getKey() + // and check if the port is bidirectional + .contains("TXRX")) { + srgType = OpenroadmTpType.SRGTXRXPP; + } else if (direction.equalsIgnoreCase("aToz")) { + srgType = OpenroadmTpType.SRGRXPP; + } else { + srgType = OpenroadmTpType.SRGTXPP; + } break; case SRGTXCP: LOG.info("getRdmSrgClient: Getting UNI Rx PP port ..."); @@ -365,7 +376,7 @@ public class PceOpticalNode implements PceNode { return; } // Detect A and Z - if (this.getSupNetworkNodeId().equals(anodeId) || (this.getSupNetworkNodeId().equals(znodeId))) { + if (anodeId.contains(this.getSupNetworkNodeId()) || (znodeId.contains(this.getSupNetworkNodeId()))) { LOG.info("validateAZxponder: A or Z node detected == {}", nodeId.getValue()); initXndrTps(serviceFormat); return;