X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FR2RLinkDiscovery.java;h=07616f72121600701b88c81e0713eb62d3d98ab1;hb=a662883c766544710312c550943b19637578572a;hp=5bc386548628d06ec8e692e8b347ffb106ee351b;hpb=0da8cea9fcd1c78753493ed6929f6e3241da06df;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java index 5bc386548..07616f721 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java @@ -7,37 +7,39 @@ */ package org.opendaylight.transportpce.networkmodel; +import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_1_2_1; +import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_2_2_1; + +import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.MountPoint; -import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.MountPoint; +import org.opendaylight.mdsal.binding.api.ReadTransaction; +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.openroadminterfaces.OpenRoadmInterfaceException; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; -import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology; +import org.opendaylight.transportpce.common.network.NetworkTransactionService; +import org.opendaylight.transportpce.networkmodel.util.TopologyUtils; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev170929.Direction; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.packs.CircuitPacks; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.packs.CircuitPacksKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface; 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.Degree; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.DegreeKey; 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.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRoadmNodesInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.Network; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.NodesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,72 +48,125 @@ public class R2RLinkDiscovery { private static final Logger LOG = LoggerFactory.getLogger(R2RLinkDiscovery.class); private final DataBroker dataBroker; + private final NetworkTransactionService networkTransactionService; private final DeviceTransactionManager deviceTransactionManager; - private final OpenRoadmTopology openRoadmTopology; - private final OpenRoadmInterfaces openRoadmInterfaces; - public R2RLinkDiscovery(final DataBroker dataBroker, - DeviceTransactionManager deviceTransactionManager, OpenRoadmTopology openRoadmTopology, - OpenRoadmInterfaces openRoadmInterfaces) { + public R2RLinkDiscovery(final DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, + NetworkTransactionService networkTransactionService) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; - this.openRoadmTopology = openRoadmTopology; - this.openRoadmInterfaces = openRoadmInterfaces; + this.networkTransactionService = networkTransactionService; } - public boolean readLLDP(NodeId nodeId) { - InstanceIdentifier protocolsIID = - InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Protocols.class); - Optional protocolObject = - this.deviceTransactionManager.getDataFromDevice(nodeId.getValue(), LogicalDatastoreType.OPERATIONAL, - protocolsIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (!protocolObject.isPresent() || (protocolObject.get().getAugmentation(Protocols1.class) == null)) { - LOG.warn("LLDP subtree is missing : isolated openroadm device"); - return false; - } - NbrList nbrList = protocolObject.get().getAugmentation(Protocols1.class).getLldp().getNbrList(); - LOG.info("LLDP subtree is present. Device has {} neighbours", nbrList.getIfName().size()); - for (IfName ifName : nbrList.getIfName()) { - if (ifName.getRemoteSysName() == null) { - LOG.error("LLDP subtree is empty in the device for nodeId: {}", - nodeId.getValue()); + public boolean readLLDP(NodeId nodeId, String nodeVersion) { + + if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) { + InstanceIdentifier protocolsIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(Protocols.class); + Optional protocolObject = this.deviceTransactionManager.getDataFromDevice(nodeId.getValue(), + LogicalDatastoreType.OPERATIONAL, protocolsIID, Timeouts.DEVICE_READ_TIMEOUT, + Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!protocolObject.isPresent() || (protocolObject.get().augmentation(Protocols1.class) == null)) { + LOG.warn("LLDP subtree is missing : isolated openroadm device"); return false; } - Optional mps = this.deviceTransactionManager.getDeviceMountPoint(ifName.getRemoteSysName()); - if (!mps.isPresent()) { - LOG.warn("Neighbouring nodeId: {} is not mounted yet", ifName.getRemoteSysName()); + NbrList nbrList = protocolObject.get().augmentation(Protocols1.class).getLldp().getNbrList(); + LOG.info("LLDP subtree is present. Device has {} neighbours", nbrList.getIfName().size()); + for (IfName ifName : nbrList.getIfName()) { + if (ifName.getRemoteSysName() == null) { + LOG.warn("LLDP subtree neighbour is empty for nodeId: {}, ifName: {}", + nodeId.getValue(),ifName.getIfName()); + } else { + Optional mps = this.deviceTransactionManager.getDeviceMountPoint(ifName + .getRemoteSysName()); + if (!mps.isPresent()) { + LOG.warn("Neighbouring nodeId: {} is not mounted yet", ifName.getRemoteSysName()); + // The controller raises a warning rather than an error because the first node to + // mount cannot see its neighbors yet. The link will be detected when processing + // the neighbor node. + } else { + if (!createR2RLink(nodeId, ifName.getIfName(), ifName.getRemoteSysName(), + ifName.getRemotePortId())) { + LOG.error("Link Creation failed between {} and {} nodes.", nodeId.getValue(), + ifName.getRemoteSysName()); + return false; + } + } + } + } + return true; + } + else if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) { + InstanceIdentifier protocolsIID = 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 protocolObject = this.deviceTransactionManager + .getDataFromDevice(nodeId.getValue(), LogicalDatastoreType.OPERATIONAL, protocolsIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!protocolObject.isPresent() || (protocolObject.get().augmentation(org.opendaylight.yang.gen.v1.http.org + .openroadm.lldp.rev181019.Protocols1.class) == null)) { + LOG.warn("LLDP subtree is missing : isolated openroadm device"); return false; - } else { - if (!createR2RLink(nodeId, ifName.getIfName(), ifName.getRemoteSysName(), - ifName.getRemotePortId())) { - LOG.warn("Link Creation failed between {} and {} nodes.", nodeId, ifName.getRemoteSysName()); - return false; + } + org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.lldp.@Nullable NbrList nbrList + = protocolObject.get().augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019 + .Protocols1.class).getLldp().getNbrList(); + LOG.info("LLDP subtree is present. Device has {} neighbours", nbrList.getIfName().size()); + for (org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.lldp.nbr.list.IfName + ifName : nbrList.getIfName()) { + if (ifName.getRemoteSysName() == null) { + LOG.warn("LLDP subtree neighbour is empty for nodeId: {}, ifName: {}", + nodeId.getValue(),ifName.getIfName()); + } else { + Optional mps = this.deviceTransactionManager.getDeviceMountPoint(ifName + .getRemoteSysName()); + if (!mps.isPresent()) { + LOG.warn("Neighbouring nodeId: {} is not mounted yet", ifName.getRemoteSysName()); + // The controller raises a warning rather than an error because the first node to + // mount cannot see its neighbors yet. The link will be detected when processing + // the neighbor node. + } else { + if (!createR2RLink(nodeId, ifName.getIfName(), ifName.getRemoteSysName(), + ifName.getRemotePortId())) { + LOG.error("Link Creation failed between {} and {} nodes.", nodeId, ifName + .getRemoteSysName()); + return false; + } + } } } + return true; + } + else { + LOG.error("Unable to read LLDP data for unmanaged openroadm device version"); + return false; } - return true; } public Direction getDegreeDirection(Integer degreeCounter, NodeId nodeId) { - InstanceIdentifier deviceIID = - InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Degree.class, new DegreeKey(degreeCounter)); - Optional degreeObject = - this.deviceTransactionManager.getDataFromDevice(nodeId.getValue(), LogicalDatastoreType.OPERATIONAL, - deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (degreeObject.isPresent()) { - Integer connectionPortCount = degreeObject.get().getConnectionPorts().size(); - if (connectionPortCount == 1) { - return Direction.Bidirectional; - } else if (connectionPortCount > 1) { - return Direction.Tx; - } else { - return Direction.NotApplicable; + InstanceIdentifier nodesIID = InstanceIdentifier.builder(Network.class) + .child(Nodes.class, new NodesKey(nodeId.getValue())).build(); + try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { + Optional nodesObject = readTx.read(LogicalDatastoreType.CONFIGURATION, nodesIID).get(); + if (nodesObject.isPresent() && (nodesObject.get().getMapping() != null)) { + List mappingList = nodesObject.get().getMapping(); + mappingList = mappingList.stream().filter(mp -> mp.getLogicalConnectionPoint().contains("DEG" + + degreeCounter)).collect(Collectors.toList()); + if (mappingList.size() == 1) { + return Direction.Bidirectional; + } else if (mappingList.size() > 1) { + return Direction.Tx; + } else { + return Direction.NotApplicable; + } } - } else { - LOG.error("Couldnt retrieve Degree object for nodeId: {} and DegreeNumbner: {}", - nodeId.getValue(),degreeCounter); - return Direction.NotApplicable; + } catch (InterruptedException | ExecutionException e) { + LOG.error("Failed getting Mapping data from portMapping",e); } + return Direction.NotApplicable; } public boolean createR2RLink(NodeId nodeId, String interfaceName, String remoteSystemName, @@ -120,14 +175,14 @@ public class R2RLinkDiscovery { String srcTpRx = null; String destTpTx = null; String destTpRx = null; - //Find which degree is associated with ethernet interface - //portmapping.getDegFromCP(nodeId,interfaceName); - Integer srcDegId = getDegFromCP(nodeId, interfaceName); + // Find which degree is associated with ethernet interface + Integer srcDegId = getDegFromInterface(nodeId, interfaceName); if (srcDegId == null) { LOG.error("Couldnt find degree connected to Ethernet interface for nodeId: {}", nodeId); return false; } - // Check whether degree is Unidirectional or Bidirectional by counting number of + // Check whether degree is Unidirectional or Bidirectional by counting + // number of // circuit-packs under degree subtree Direction sourceDirection = getDegreeDirection(srcDegId, nodeId); if (Direction.NotApplicable == sourceDirection) { @@ -142,13 +197,13 @@ public class R2RLinkDiscovery { } // Find degree for which Ethernet interface is created on other end NodeId destNodeId = new NodeId(remoteSystemName); - Integer destDegId = getDegFromCP(destNodeId, remoteInterfaceName); - //portmapping.getDegFromCP(nodeId,interfaceName); + Integer destDegId = getDegFromInterface(destNodeId, remoteInterfaceName); if (destDegId == null) { LOG.error("Couldnt find degree connected to Ethernet interface for nodeId: {}", nodeId); return false; } - // Check whether degree is Unidirectional or Bidirectional by counting number of + // Check whether degree is Unidirectional or Bidirectional by counting + // number of // circuit-packs under degree subtree Direction destinationDirection = getDegreeDirection(destDegId, destNodeId); if (Direction.NotApplicable == destinationDirection) { @@ -161,50 +216,48 @@ public class R2RLinkDiscovery { destTpTx = "DEG" + destDegId + "-TTP-TX"; destTpRx = "DEG" + destDegId + "-TTP-RX"; } - //A->Z + // A->Z LOG.debug( "Found a neighbor SrcNodeId: {} , SrcDegId: {} , SrcTPId: {}, DestNodeId:{} , DestDegId: {}, DestTPId: {}", nodeId.getValue(), srcDegId, srcTpTx, destNodeId, destDegId, destTpRx); InitRoadmNodesInputBuilder r2rlinkBuilderAToZ = new InitRoadmNodesInputBuilder(); - r2rlinkBuilderAToZ.setRdmANode(nodeId.getValue()) - .setDegANum(srcDegId.shortValue()).setTerminationPointA(srcTpTx) - .setRdmZNode(destNodeId.getValue()) - .setDegZNum(destDegId.shortValue()).setTerminationPointZ(destTpRx); - if (!OrdLink.createRdm2RdmLinks(r2rlinkBuilderAToZ.build(),openRoadmTopology, - dataBroker)) { - LOG.error("OMS Link creation failed between node: {} and nodeId: {} in A->Z direction", - nodeId.getValue(),destNodeId.getValue()); + r2rlinkBuilderAToZ.setRdmANode(nodeId.getValue()).setDegANum(Uint8.valueOf(srcDegId)) + .setTerminationPointA(srcTpTx).setRdmZNode(destNodeId.getValue()).setDegZNum(Uint8.valueOf(destDegId)) + .setTerminationPointZ(destTpRx); + if (!OrdLink.createRdm2RdmLinks(r2rlinkBuilderAToZ.build(), this.dataBroker)) { + LOG.error("OMS Link creation failed between node: {} and nodeId: {} in A->Z direction", nodeId.getValue(), + destNodeId.getValue()); return false; } - //Z->A + // Z->A LOG.debug( - "Found a neighbor SrcNodeId: {} , SrcDegId: {}" - + ", SrcTPId: {}, DestNodeId:{} , DestDegId: {}, DestTPId: {}", - destNodeId, destDegId, destTpTx, nodeId.getValue(), srcDegId, srcTpRx); + "Found a neighbor SrcNodeId: {} , SrcDegId: {}" + + ", SrcTPId: {}, DestNodeId:{} , DestDegId: {}, DestTPId: {}", + destNodeId, destDegId, destTpTx, nodeId.getValue(), srcDegId, srcTpRx); - InitRoadmNodesInputBuilder r2rlinkBuilderZToA = new InitRoadmNodesInputBuilder(); - r2rlinkBuilderZToA.setRdmANode(destNodeId.getValue()) - .setDegANum(destDegId.shortValue()).setTerminationPointA(destTpTx) - .setRdmZNode(nodeId.getValue()) - .setDegZNum(srcDegId.shortValue()).setTerminationPointZ(srcTpRx); - if (!OrdLink.createRdm2RdmLinks(r2rlinkBuilderZToA.build(),openRoadmTopology, - dataBroker)) { + InitRoadmNodesInputBuilder r2rlinkBuilderZToA = new InitRoadmNodesInputBuilder() + .setRdmANode(destNodeId.getValue()) + .setDegANum(Uint8.valueOf(destDegId)) + .setTerminationPointA(destTpTx) + .setRdmZNode(nodeId.getValue()) + .setDegZNum(Uint8.valueOf(srcDegId)) + .setTerminationPointZ(srcTpRx); + if (!OrdLink.createRdm2RdmLinks(r2rlinkBuilderZToA.build(), this.dataBroker)) { LOG.error("OMS Link creation failed between node: {} and nodeId: {} in Z->A direction", - destNodeId.getValue(),nodeId.getValue()); + destNodeId.getValue(), nodeId.getValue()); return false; } return true; } public boolean deleteR2RLink(NodeId nodeId, String interfaceName, String remoteSystemName, - String remoteInterfaceName) { + String remoteInterfaceName) { String srcTpTx = null; String srcTpRx = null; String destTpTx = null; String destTpRx = null; - //Find which degree is associated with ethernet interface - //portmapping.getDegFromCP(nodeId,interfaceName); - Integer srcDegId = getDegFromCP(nodeId, interfaceName); + // Find which degree is associated with ethernet interface + Integer srcDegId = getDegFromInterface(nodeId, interfaceName); if (srcDegId == null) { LOG.error("Couldnt find degree connected to Ethernet interface for nodeId: {}", nodeId); return false; @@ -224,8 +277,7 @@ public class R2RLinkDiscovery { } // Find degree for which Ethernet interface is created on other end NodeId destNodeId = new NodeId(remoteSystemName); - //portmapping.getDegFromCP(nodeId,interfaceName); - Integer destDegId = getDegFromCP(destNodeId, remoteInterfaceName); + Integer destDegId = getDegFromInterface(destNodeId, remoteInterfaceName); if (destDegId == null) { LOG.error("Couldnt find degree connected to Ethernet interface for nodeId: {}", nodeId); return false; @@ -243,78 +295,41 @@ public class R2RLinkDiscovery { destTpTx = "DEG" + destDegId + "-TTP-TX"; destTpRx = "DEG" + destDegId + "-TTP-RX"; } - return this.openRoadmTopology.deleteLink(nodeId.getValue(), destNodeId.getValue(), srcTpTx, destTpRx) - && this.openRoadmTopology.deleteLink(destNodeId.getValue(), nodeId.getValue(), destTpTx, srcTpRx); + return TopologyUtils.deleteLink(nodeId.getValue() + "-" + srcDegId, destNodeId.getValue() + "-" + destDegId, + srcTpTx, destTpRx, networkTransactionService) + && TopologyUtils.deleteLink(destNodeId.getValue() + "-" + destDegId, nodeId.getValue() + "-" + srcDegId, + destTpTx, srcTpRx, networkTransactionService); } - private CpToDegree getCPtoDegreeMapping(NodeId nodeId, String circuitPackName) { - InstanceIdentifier cptoDegMappingIID = - InstanceIdentifier.builder(Network.class).child(Nodes.class, - new NodesKey(nodeId.getValue())) - .child(CpToDegree.class, new CpToDegreeKey(circuitPackName)).build(); - LOG.debug("Input parameters are {},{}", nodeId.getValue(), circuitPackName); - try (ReadOnlyTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { - Optional cptpDegObject = - readTx.read(LogicalDatastoreType.CONFIGURATION, cptoDegMappingIID).get().toJavaUtil(); - if (cptpDegObject.isPresent()) { - CpToDegree cpToDeg = cptpDegObject.get(); - LOG.debug("Found mapping for the Circuit Pack {}. Degree: {}", circuitPackName, cpToDeg); - return cpToDeg; + private Integer getDegFromInterface(NodeId nodeId, String interfaceName) { + InstanceIdentifier nodesIID = InstanceIdentifier.builder(Network.class) + .child(Nodes.class, new NodesKey(nodeId.getValue())).build(); + try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { + Optional nodesObject = readTx.read(LogicalDatastoreType.CONFIGURATION, nodesIID).get(); + if (nodesObject.isPresent() && (nodesObject.get().getCpToDegree() != null)) { + List cpToDeg = nodesObject.get().getCpToDegree(); + Stream cpToDegStream = cpToDeg.stream().filter(cp -> cp.getInterfaceName() != null) + .filter(cp -> cp.getInterfaceName().equals(interfaceName)); + if (cpToDegStream != null) { + @SuppressWarnings("unchecked") Optional firstCpToDegree = cpToDegStream.findFirst(); + if (firstCpToDegree.isPresent() && (firstCpToDegree != null)) { + LOG.debug("Found and returning {}",firstCpToDegree.get().getDegreeNumber().intValue()); + return firstCpToDegree.get().getDegreeNumber().intValue(); + } else { + LOG.debug("Not found so returning nothing"); + return null; + } + } else { + LOG.warn("CircuitPack stream couldnt find anything for nodeId: {} and interfaceName: {}", + nodeId.getValue(),interfaceName); + } } else { - LOG.warn("Could not find mapping for Circuit Pack {} for nodeId {}", circuitPackName, - nodeId.getValue()); + LOG.warn("Could not find mapping for Interface {} for nodeId {}", interfaceName, + nodeId.getValue()); } } catch (InterruptedException | ExecutionException ex) { - LOG.error("Unable to read mapping for circuit pack : {} for nodeId {}", circuitPackName, nodeId, ex); + LOG.error("Unable to read mapping for Interface : {} for nodeId {}", interfaceName, nodeId, ex); } return null; } - - private Integer getDegFromParentCP(NodeId nodeId, String interfaceName, String supportingCircuitPack) { - InstanceIdentifier circuitPackIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPack)); - Optional circuitPackObject = - this.deviceTransactionManager.getDataFromDevice(nodeId.getValue(), LogicalDatastoreType.OPERATIONAL, - circuitPackIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (!circuitPackObject.isPresent() - || (circuitPackObject.get().getParentCircuitPack().getCircuitPackName() == null)) { - LOG.warn("Parent circuitpack not found for NodeId: {} and Interface: {}", nodeId, interfaceName); - return null; - } - String parentCP = circuitPackObject.get().getParentCircuitPack().getCircuitPackName(); - CpToDegree cpToDegree = getCPtoDegreeMapping(nodeId, parentCP); - if (cpToDegree == null) { - LOG.error("CP to Degree mapping not found even with parent circuitpack for NodeID: {}" + "and Interface {}", - nodeId, interfaceName); - return null; - } else { - LOG.debug("CP to degree is {}", cpToDegree.getDegreeNumber()); - return cpToDegree.getDegreeNumber().intValue(); - } - } - - private Integer getDegFromCP(NodeId nodeId, String interfaceName) { - try { - java.util.Optional interfaceOpt = this.openRoadmInterfaces.getInterface(nodeId.getValue(), - interfaceName); - if (!interfaceOpt.isPresent()) { - LOG.warn("Interface with {} on node {} was not found!", interfaceName, nodeId.getValue()); - return null; - } - String supportingCircuitPack = interfaceOpt.get().getSupportingCircuitPackName(); - LOG.debug("Supporting circuitpack name is :{}", - interfaceOpt.get().getSupportingCircuitPackName()); - CpToDegree cpToDegree = getCPtoDegreeMapping(nodeId, supportingCircuitPack); - // Currently devices have different ways to represent connection to Ethernet port and degree port - // If Circuit pack is not present under degree tree then read parent CP of given CP(Circuit pack) - if (cpToDegree != null) { - return cpToDegree.getDegreeNumber().intValue(); - } else { - return getDegFromParentCP(nodeId, interfaceName, supportingCircuitPack); - } - } catch (OpenRoadmInterfaceException ex) { - LOG.error("Failed to get source interface {} from node {}!", interfaceName, nodeId, ex); - return null; - } - } }