X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FR2RLinkDiscovery.java;h=c120a38b214ea12120a9a705be03d82f3b823e3a;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=78b76f2d29111a3119e60648edc1e8b35d8c400e;hpb=bcd977c8b7d1ad3451607e895b5e032064153c8c;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 78b76f2d2..c120a38b2 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java @@ -7,34 +7,38 @@ */ package org.opendaylight.transportpce.networkmodel; -import java.util.List; +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.Collection; 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.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.rev210315.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.cp.to.degree.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.NodesKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev170929.Direction; 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.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.Mapping; +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; @@ -43,63 +47,115 @@ 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) { + 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(), + 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; + if (!protocolObject.isPresent() || (protocolObject.get().augmentation(Protocols1.class) == null)) { + LOG.warn("LLDP subtree is missing : isolated openroadm device"); + return false; + } + NbrList nbrList = protocolObject.get().augmentation(Protocols1.class).getLldp().getNbrList(); + LOG.info("LLDP subtree is present. Device has {} neighbours", nbrList.getIfName().size()); + boolean success = true; + for (IfName ifName : nbrList.nonnullIfName().values()) { + 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()); + success = false; + } + } + } + } + return success; } - 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: {}", + 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; + } + 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()); + boolean success = true; + for (org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.lldp.nbr.list.IfName + ifName : nbrList.nonnullIfName().values()) { + 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(), + 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; + LOG.error("Link Creation failed between {} and {} nodes.", nodeId, ifName + .getRemoteSysName()); + success = false; + } } } } + return success; + } + 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 nodesIID = InstanceIdentifier.builder(Network.class) - .child(Nodes.class, new NodesKey(nodeId.getValue())).build(); - try (ReadOnlyTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { - Optional nodesObject = readTx.read(LogicalDatastoreType.CONFIGURATION, nodesIID) - .get().toJavaUtil(); - if (nodesObject.isPresent() && nodesObject.get().getMapping() != null) { - List mappingList = nodesObject.get().getMapping(); + .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)) { + Collection mappingList = nodesObject.get().nonnullMapping().values(); mappingList = mappingList.stream().filter(mp -> mp.getLogicalConnectionPoint().contains("DEG" - + degreeCounter)).collect(Collectors.toList()); + + degreeCounter)).collect(Collectors.toList()); if (mappingList.size() == 1) { return Direction.Bidirectional; } else if (mappingList.size() > 1) { @@ -166,27 +222,30 @@ public class R2RLinkDiscovery { "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(), this.openRoadmTopology, this.dataBroker)) { + 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()); + destNodeId.getValue()); return false; } // 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(), this.openRoadmTopology, this.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; @@ -237,25 +296,24 @@ public class R2RLinkDiscovery { destTpTx = "DEG" + destDegId + "-TTP-TX"; destTpRx = "DEG" + destDegId + "-TTP-RX"; } - return this.openRoadmTopology.deleteLink(nodeId.getValue(), destNodeId.getValue(), - srcDegId, destDegId, srcTpTx, destTpRx) - && this.openRoadmTopology.deleteLink(destNodeId.getValue(), nodeId.getValue(), - destDegId, srcDegId, 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 Integer getDegFromInterface(NodeId nodeId, String interfaceName) { InstanceIdentifier nodesIID = InstanceIdentifier.builder(Network.class) - .child(Nodes.class, new NodesKey(nodeId.getValue())).build(); - try (ReadOnlyTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { - Optional nodesObject = readTx.read(LogicalDatastoreType.CONFIGURATION, nodesIID) - .get().toJavaUtil(); - 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)); + .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)) { + Collection cpToDeg = nodesObject.get().nonnullCpToDegree().values(); + Stream cpToDegStream = cpToDeg.stream().filter(cp -> cp.getInterfaceName() != null) + .filter(cp -> cp.getInterfaceName().equals(interfaceName)); if (cpToDegStream != null) { - Optional firstCpToDegree = cpToDegStream.findFirst(); - if (firstCpToDegree.isPresent() && firstCpToDegree != 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 { @@ -264,11 +322,11 @@ public class R2RLinkDiscovery { } } else { LOG.warn("CircuitPack stream couldnt find anything for nodeId: {} and interfaceName: {}", - nodeId.getValue(),interfaceName); + nodeId.getValue(),interfaceName); } } else { LOG.warn("Could not find mapping for Interface {} for nodeId {}", interfaceName, - nodeId.getValue()); + nodeId.getValue()); } } catch (InterruptedException | ExecutionException ex) { LOG.error("Unable to read mapping for Interface : {} for nodeId {}", interfaceName, nodeId, ex);