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=611263d68a3f43e490abc0af1ab034a9146faa65;hb=59cc97ad9cd8aa61b6730879dd448651a796c290;hp=eb12259f13762b2fb0e3be6e2be97aa9a5a6b655;hpb=2fc5888c2ab34c93317242a23e46b8d6c35c0292;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 eb12259f1..611263d68 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 @@ -21,23 +21,24 @@ import org.opendaylight.transportpce.common.StringConstants; 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.pce.rev220808.path.computation.reroute.request.input.Endpoints; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1; +import org.opendaylight.transportpce.pce.networkanalyzer.port.Preference; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.path.computation.reroute.request.input.Endpoints; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.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.rev211210.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.networks.network.node.termination.point.XpdrNetworkAttributes; -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.network.topology.rev230526.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.networks.network.node.termination.point.XpdrNetworkAttributes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.available.freq.map.AvailFreqMapsKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev230526.IfOCH; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev230526.IfOCHOTU4ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev230526.IfOtsiOtsigroup; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev230526.SupportedIfCapability; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129.ServiceFormat; -import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev211210.xpdr.mode.attributes.supported.operational.modes.OperationalMode; -import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev211210.xpdr.mode.attributes.supported.operational.modes.OperationalModeKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev230526.xpdr.mode.attributes.supported.operational.modes.OperationalMode; +import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev230526.xpdr.mode.attributes.supported.operational.modes.OperationalModeKey; 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; @@ -92,9 +93,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.rev211210.Node1.class).getAdministrativeState(); + .org.openroadm.common.network.rev230526.Node1.class).getAdministrativeState(); this.state = node.augmentation(org.opendaylight.yang.gen.v1.http - .org.openroadm.common.network.rev211210.Node1.class).getOperationalState(); + .org.openroadm.common.network.rev230526.Node1.class).getOperationalState(); } else { LOG.error("PceNode {} : one of parameters is not populated : nodeId, node type, slot width granularity", deviceNodeId); @@ -102,7 +103,7 @@ public class PceOpticalNode implements PceNode { } } - public void initSrgTps() { + public void initSrgTps(Preference portPreference) { this.availableSrgPp.clear(); this.availableSrgCp.clear(); if (!isValid()) { @@ -122,8 +123,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.rev211210.TerminationPoint1 nttp1 = tp - .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210 + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.TerminationPoint1 nttp1 = tp + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526 .TerminationPoint1.class); OpenroadmTpType type = cntp1.getTpType(); LOG.debug("type = {} for tp {}", type.getName(), tp); @@ -141,6 +142,10 @@ public class PceOpticalNode implements PceNode { case SRGTXPP: case SRGTXRXPP: LOG.debug("initSrgTpList: SRG-PP tp = {} found", tp.getTpId().getValue()); + if (!portPreference.isPreferredPort(nodeId.getValue(), tp.getTpId().getValue())) { + LOG.warn("initSrgTpList: SRG-PP tp = {} is rejected by the client", tp.getTpId().getValue()); + break; + } if (isTerminationPointAvailable(nttp1)) { LOG.debug("initSrgTpList: adding SRG-PP tp '{}'", tp.getTpId().getValue()); this.availableSrgPp.put(tp.getTpId().getValue(), cntp1.getTpType()); @@ -166,7 +171,7 @@ public class PceOpticalNode implements PceNode { } private boolean isTerminationPointAvailable( - org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1) { + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.TerminationPoint1 nttp1) { byte[] availableByteArray = new byte[GridConstant.NB_OCTECTS]; Arrays.fill(availableByteArray, (byte) GridConstant.AVAILABLE_SLOT_VALUE); return nttp1 == null || nttp1.getPpAttributes() == null @@ -205,8 +210,8 @@ public class PceOpticalNode implements PceNode { return; } Node1 node1 = this.node.augmentation(Node1.class); - 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 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Node1 node11 = + this.node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Node1 .class); switch (this.nodeType) { case SRG : @@ -290,8 +295,8 @@ public class PceOpticalNode implements PceNode { if (endpoints == null || (!endpoints.getAEndTp().equals(tp.getTpId().getValue()) && !endpoints.getZEndTp().equals(tp.getTpId().getValue()))) { - 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 + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.TerminationPoint1 nttp1 = + tp.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526 .TerminationPoint1.class); if (nttp1 != null && nttp1.getXpdrNetworkAttributes().getWavelength() != null) { this.usedXpndrNWTps.add(tp.getTpId().getValue()); @@ -365,7 +370,7 @@ public class PceOpticalNode implements PceNode { return null; } LOG.debug("getRdmSrgClient: client PP {} for CP {} found !", client, tp); - return client.get(); + return client.orElseThrow(); } @Override