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=0cf4e4dce5af55d22c32d8ef5a8a5d50a2a1fc09;hpb=34cbca4ad81fbd29e833197f0e4b09128daa8b95;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 0cf4e4dce..c120a38b2 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java @@ -10,12 +10,11 @@ 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.Collection; import java.util.Optional; 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.DataBroker; import org.opendaylight.mdsal.binding.api.MountPoint; @@ -24,13 +23,13 @@ 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.networkmodel.util.OpenRoadmFactory; +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.rev200113.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +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; @@ -39,6 +38,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.conta 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.rev180226.NodeId; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,13 +49,11 @@ public class R2RLinkDiscovery { private final DataBroker dataBroker; private final NetworkTransactionService networkTransactionService; private final DeviceTransactionManager deviceTransactionManager; - private final OpenRoadmFactory openRoadmFactory; public R2RLinkDiscovery(final DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, - OpenRoadmFactory openRoadmFactory, NetworkTransactionService networkTransactionService) { + NetworkTransactionService networkTransactionService) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; - this.openRoadmFactory = openRoadmFactory; this.networkTransactionService = networkTransactionService; } @@ -73,7 +71,8 @@ public class R2RLinkDiscovery { } 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()) { + 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()); @@ -90,12 +89,12 @@ public class R2RLinkDiscovery { ifName.getRemotePortId())) { LOG.error("Link Creation failed between {} and {} nodes.", nodeId.getValue(), ifName.getRemoteSysName()); - return false; + success = false; } } } } - return true; + return success; } else if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) { InstanceIdentifier nodesObject = readTx.read(LogicalDatastoreType.CONFIGURATION, nodesIID).get(); if (nodesObject.isPresent() && (nodesObject.get().getMapping() != null)) { - List mappingList = nodesObject.get().getMapping(); + Collection mappingList = nodesObject.get().nonnullMapping().values(); mappingList = mappingList.stream().filter(mp -> mp.getLogicalConnectionPoint().contains("DEG" + degreeCounter)).collect(Collectors.toList()); if (mappingList.size() == 1) { @@ -222,10 +222,10 @@ 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()) + 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.openRoadmFactory, this.dataBroker)) { + 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; @@ -236,11 +236,14 @@ public class R2RLinkDiscovery { + ", 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()) + 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.openRoadmFactory, this.dataBroker)) { + 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()); return false; @@ -293,12 +296,10 @@ public class R2RLinkDiscovery { destTpTx = "DEG" + destDegId + "-TTP-TX"; destTpRx = "DEG" + destDegId + "-TTP-RX"; } - return this.openRoadmFactory.deleteLink(nodeId.getValue() + "-" + srcDegId.toString(), - destNodeId.getValue() + "-" + destDegId.toString(), - srcTpTx.toString(), destTpRx.toString(),networkTransactionService) - && this.openRoadmFactory.deleteLink(destNodeId.getValue() + "-" + destDegId.toString(), - nodeId.getValue() + "-" + srcDegId.toString(), destTpTx, srcTpRx, - networkTransactionService); + 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) { @@ -307,8 +308,8 @@ public class R2RLinkDiscovery { 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) + Collection cpToDeg = nodesObject.get().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();