X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2FR2RTapiLinkDiscovery.java;h=886aac77888ab8e992268ec43ff2970d0773869e;hb=refs%2Fchanges%2F10%2F111110%2F3;hp=d2d36f129b3a4239d59609d5118b85198413f22a;hpb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;p=transportpce.git diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/R2RTapiLinkDiscovery.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/R2RTapiLinkDiscovery.java index d2d36f129..886aac778 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/R2RTapiLinkDiscovery.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/R2RTapiLinkDiscovery.java @@ -9,35 +9,35 @@ package org.opendaylight.transportpce.tapi; import java.util.Collection; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.api.MountPoint; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.tapi.utils.TapiLink; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.cp.to.degree.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev170929.Direction; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.cp.to.degree.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceData; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.Protocols; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.Protocols1; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.NbrList; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.nbr.list.IfName; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.Direction; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.LayerProtocolName; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.LinkKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.LayerProtocolName; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.Uuid; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.LinkKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +51,7 @@ public class R2RTapiLinkDiscovery { private final TapiLink tapiLink; public R2RTapiLinkDiscovery(NetworkTransactionService networkTransactionService, - DeviceTransactionManager deviceTransactionManager, TapiLink tapiLink) { + DeviceTransactionManager deviceTransactionManager, TapiLink tapiLink) { this.networkTransactionService = networkTransactionService; this.deviceTransactionManager = deviceTransactionManager; this.tapiLink = tapiLink; @@ -64,41 +64,44 @@ public class R2RTapiLinkDiscovery { switch (nodeVersion) { case 1: // 1.2.1 - InstanceIdentifier protocols121IID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Protocols.class); + InstanceIdentifier protocols121IID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Protocols.class) + .build(); Optional protocol121Object = this.deviceTransactionManager.getDataFromDevice( nodeId.getValue(), LogicalDatastoreType.OPERATIONAL, protocols121IID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (!protocol121Object.isPresent() - || (protocol121Object.get().augmentation(Protocols1.class) == null)) { - LOG.warn("LLDP subtree is missing : isolated openroadm device"); + if (hasNoNeighbor121(protocol121Object)) { + LOG.warn("LLDP subtree is missing or incomplete: isolated openroadm device"); return new HashMap<>(); } // get neighbor list - NbrList nbr121List = protocol121Object.get().augmentation(Protocols1.class).getLldp().getNbrList(); + NbrList nbr121List = protocol121Object.orElseThrow().augmentation(Protocols1.class).getLldp() + .getNbrList(); LOG.info("LLDP subtree is present. Device has {} neighbours", nbr121List.getIfName().size()); // try to create rdm2rdm link return rdm2rdmLinkCreatev121(nodeId, tapiTopoUuid, nbr121List); case 2: // 2.2.1 InstanceIdentifier protocols221IID = - InstanceIdentifier.create(org.opendaylight.yang.gen.v1.http - .org.openroadm.device.rev181019.org.openroadm.device.container.OrgOpenroadmDevice.class) - .child(org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019 - .org.openroadm.device.container.org.openroadm.device.Protocols.class); - Optional protocol221Object = this.deviceTransactionManager + .container.org.openroadm.device.Protocols> protocols221IID = InstanceIdentifier + .builderOfInherited( + org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.OrgOpenroadmDeviceData.class, + org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container + .OrgOpenroadmDevice.class) + .child(org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device + .container.org.openroadm.device.Protocols.class) + .build(); + var protocol221Object = this.deviceTransactionManager .getDataFromDevice(nodeId.getValue(), LogicalDatastoreType.OPERATIONAL, protocols221IID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (!protocol221Object.isPresent() || (protocol221Object.get().augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.Protocols1.class) == null)) { - LOG.warn("LLDP subtree is missing : isolated openroadm device"); + if (hasNoNeighbor221(protocol221Object)) { + LOG.warn("LLDP subtree is missing or incomplete: isolated openroadm device"); return new HashMap<>(); } - org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.lldp.@Nullable NbrList - nbr221List = protocol221Object.get().augmentation(org.opendaylight.yang.gen.v1.http - .org.openroadm.lldp.rev181019.Protocols1.class).getLldp().getNbrList(); + var nbr221List = protocol221Object.orElseThrow().augmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.Protocols1.class) + .getLldp().getNbrList(); LOG.info("LLDP subtree is present. Device has {} neighbours", nbr221List.getIfName().size()); return rdm2rdmLinkCreatev221(nodeId, tapiTopoUuid, nbr221List); case 3: @@ -111,6 +114,27 @@ public class R2RTapiLinkDiscovery { } } + private boolean hasNoNeighbor121(Optional protocol121Object) { + return protocol121Object.isEmpty() + || protocol121Object.orElseThrow().augmentation(Protocols1.class) == null + || protocol121Object.orElseThrow().augmentation(Protocols1.class).getLldp() == null + || protocol121Object.orElseThrow().augmentation(Protocols1.class).getLldp().getNbrList() == null; + } + + private boolean hasNoNeighbor221(Optional< + org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org + .openroadm.device.Protocols> protocol221Object) { + return protocol221Object.isEmpty() + || protocol221Object.orElseThrow().augmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.Protocols1.class) == null + || protocol221Object.orElseThrow().augmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.Protocols1.class) + .getLldp() == null + || protocol221Object.orElseThrow().augmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.Protocols1.class) + .getLldp().getNbrList() == null; + } + private Map rdm2rdmLinkCreatev221(NodeId nodeId, Uuid tapiTopoUuid, org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.lldp.NbrList nbrList) { Map linkMap = new HashMap<>(); @@ -225,11 +249,14 @@ public class R2RTapiLinkDiscovery { + "DestDegId: {}, DestTPId: {}", nodeId.getValue(), srcDegId, srcTpTx, destNodeId, destDegId, destTpRx); Link omsLink = this.tapiLink.createTapiLink(nodeId.getValue(), srcTpTx, destNodeId.getValue(), destTpTx, TapiStringConstants.OMS_RDM_RDM_LINK, TapiStringConstants.PHTNC_MEDIA, TapiStringConstants.PHTNC_MEDIA, - TapiStringConstants.PHTNC_MEDIA, TapiStringConstants.PHTNC_MEDIA, + TapiStringConstants.PHTNC_MEDIA_OTS, TapiStringConstants.PHTNC_MEDIA_OTS, this.tapiLink.getAdminState(nodeId.getValue(), destNodeId.getValue(), srcTpTx, destTpTx), this.tapiLink.getOperState(nodeId.getValue(), destNodeId.getValue(), srcTpTx, destTpTx), - List.of(LayerProtocolName.PHOTONICMEDIA), List.of(LayerProtocolName.PHOTONICMEDIA.getName()), tapiTopoUuid); + Set.of(LayerProtocolName.PHOTONICMEDIA), Set.of(LayerProtocolName.PHOTONICMEDIA.getName()), tapiTopoUuid); LOG.info("Tapi R2R Link OMS link created = {}", omsLink); + LOG.debug("inputAdminstate= {}, inputoperstate = {}", + this.tapiLink.getAdminState(nodeId.getValue(), destNodeId.getValue(), srcTpTx, destTpTx), + this.tapiLink.getOperState(nodeId.getValue(), destNodeId.getValue(), srcTpTx, destTpTx)); return omsLink; } @@ -240,22 +267,22 @@ public class R2RTapiLinkDiscovery { Optional nodesObject = this.networkTransactionService.read(LogicalDatastoreType.CONFIGURATION, nodesIID).get(); - if (nodesObject.isEmpty() || (nodesObject.get().getCpToDegree() == null)) { + if (nodesObject.isEmpty() || (nodesObject.orElseThrow().getCpToDegree() == null)) { LOG.warn("Could not find mapping for Interface {} for nodeId {}", interfaceName, nodeId.getValue()); return null; } - Collection cpToDeg = nodesObject.get().nonnullCpToDegree().values(); + Collection cpToDeg = nodesObject.orElseThrow().nonnullCpToDegree().values(); Stream cpToDegStream = cpToDeg.stream().filter(cp -> cp.getInterfaceName() != null) .filter(cp -> cp.getInterfaceName().equals(interfaceName)); if (cpToDegStream != null) { - @SuppressWarnings("unchecked") Optional firstCpToDegree = cpToDegStream.findFirst(); + Optional firstCpToDegree = cpToDegStream.findFirst(); if (firstCpToDegree.isEmpty() || (firstCpToDegree == null)) { LOG.debug("Not found so returning nothing"); return null; } - LOG.debug("Found and returning {}",firstCpToDegree.get().getDegreeNumber().intValue()); - return firstCpToDegree.get().getDegreeNumber().intValue(); + LOG.debug("Found and returning {}",firstCpToDegree.orElseThrow().getDegreeNumber().intValue()); + return firstCpToDegree.orElseThrow().getDegreeNumber().intValue(); } else { LOG.warn("CircuitPack stream couldnt find anything for nodeId: {} and interfaceName: {}", nodeId.getValue(),interfaceName); @@ -272,8 +299,8 @@ public class R2RTapiLinkDiscovery { try { Optional nodesObject = this.networkTransactionService.read(LogicalDatastoreType.CONFIGURATION, nodesIID).get(); - if (nodesObject.isPresent() && (nodesObject.get().getMapping() != null)) { - Collection mappingList = nodesObject.get().nonnullMapping().values(); + if (nodesObject.isPresent() && (nodesObject.orElseThrow().getMapping() != null)) { + Collection mappingList = nodesObject.orElseThrow().nonnullMapping().values(); mappingList = mappingList.stream().filter(mp -> mp.getLogicalConnectionPoint().contains("DEG" + degreeCounter)).collect(Collectors.toList()); if (mappingList.size() == 1) {