X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fmapping%2FPortMappingVersion221.java;h=a908de054ae60bb514c866f344ae9111a6924d8e;hb=9732c621dfe6aa4901d2bc763a17a667a386ed07;hp=f2267ce7b9839614341d077f1f1e1f8d3068c72b;hpb=2fb3efccb6a5f65056111c952eddf15ca30af35a;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java index f2267ce7b..a908de054 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java @@ -10,9 +10,8 @@ package org.opendaylight.transportpce.common.mapping; import com.google.common.util.concurrent.FluentFuture; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import java.math.BigInteger; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@ -32,24 +31,30 @@ 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.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.NetworkBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.CpToDegreeBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.CpToDegreeKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfo.OpenroadmVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfoBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.SwitchingPoolLcp; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.SwitchingPoolLcpBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.switching.pool.lcp.NonBlockingList; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.switching.pool.lcp.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilitiesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcpBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcpKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingListKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyGHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.Direction; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PortQual; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.XpdrNodeTypes; @@ -71,9 +76,11 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.SharedRiskGroup; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.SharedRiskGroupKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.Xponder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.connection.map.Destination; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.port.Interfaces; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.xponder.XpdrPort; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.InterfaceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OpenROADMOpticalMultiplex; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OpticalTransport; @@ -81,20 +88,22 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OtnO import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.Protocols1; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.Lldp; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.lldp.PortConfig; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.SupportedIfCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev191129.SwitchingPoolTypes; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +// FIXME: many common pieces of code between PortMapping Versions 121 and 221 and 710 +// some mutualization would be helpful public class PortMappingVersion221 { private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion221.class); private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; private final OpenRoadmInterfaces openRoadmInterfaces; - //FNV1 128 bit hash constants - private static final BigInteger FNV_PRIME = new BigInteger("309485009821345068724781371"); - private static final BigInteger FNV_INIT = new BigInteger("6c62272e07bb014262b821756295c58d", 16); - private static final BigInteger FNV_MOD = new BigInteger("2").pow(128); public PortMappingVersion221(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, OpenRoadmInterfaces openRoadmInterfaces) { @@ -106,23 +115,21 @@ public class PortMappingVersion221 { public boolean createMappingData(String nodeId) { LOG.info("Create Mapping Data for node 2.2.1 {}", nodeId); List portMapList = new ArrayList<>(); + List mcCapabilitiesList = new ArrayList<>(); InstanceIdentifier infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class); - Optional deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType - .OPERATIONAL, infoIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - Info deviceInfo; - NodeInfo nodeInfo; - if (deviceInfoOptional.isPresent()) { - deviceInfo = deviceInfoOptional.get(); - nodeInfo = createNodeInfo(deviceInfo); - if (nodeInfo == null) { - return false; - } else { - postPortMapping(nodeId, nodeInfo, null, null, null); - } - } else { + Optional deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice( + nodeId, LogicalDatastoreType.OPERATIONAL, infoIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!deviceInfoOptional.isPresent()) { LOG.warn("Device info subtree is absent for {}", nodeId); return false; } + Info deviceInfo = deviceInfoOptional.get(); + NodeInfo nodeInfo = createNodeInfo(deviceInfo); + if (nodeInfo == null) { + return false; + } + postPortMapping(nodeId, nodeInfo, null, null, null, null); switch (deviceInfo.getNodeType()) { @@ -140,6 +147,12 @@ public class PortMappingVersion221 { LOG.warn("Unable to create mapping for PP's on node {}", nodeId); return false; } + // Get MC capabilities + if (!createMcCapabilitiesList(nodeId, deviceInfo, mcCapabilitiesList)) { + // return false if MC capabilites failed + LOG.warn("Unable to create MC capabilities on node {}", nodeId); + return false; + } break; case Xpdr: if (!createXpdrPortMapping(nodeId, portMapList)) { @@ -152,40 +165,39 @@ public class PortMappingVersion221 { break; } - return postPortMapping(nodeId, nodeInfo, portMapList, null, null); + return postPortMapping(nodeId, nodeInfo, portMapList, null, null, mcCapabilitiesList); } public boolean updateMapping(String nodeId, Mapping oldMapping) { InstanceIdentifier portIId = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName())) .child(Ports.class, new PortsKey(oldMapping.getSupportingPort())); - if ((oldMapping != null) && (nodeId != null)) { - try { - Optional portObject = deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, portIId, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (portObject.isPresent()) { - Ports port = portObject.get(); - Mapping newMapping = createMappingObject(nodeId, port, oldMapping.getSupportingCircuitPackName(), - oldMapping.getLogicalConnectionPoint()); - LOG.info("Updating old mapping Data {} for {} of {} by new mapping data {}", oldMapping, - oldMapping.getLogicalConnectionPoint(), nodeId, newMapping); - final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); - InstanceIdentifier mapIID = InstanceIdentifier.create(Network.class) - .child(Nodes.class, new NodesKey(nodeId)) - .child(Mapping.class, new MappingKey(oldMapping.getLogicalConnectionPoint())); - writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, mapIID, newMapping); - FluentFuture commit = writeTransaction.commit(); - commit.get(); - return true; - } - return false; - } catch (InterruptedException | ExecutionException e) { - LOG.error("Error updating Mapping {} for node {}", oldMapping.getLogicalConnectionPoint(), nodeId, e); + if ((oldMapping == null) || (nodeId == null)) { + LOG.error("Impossible to update mapping"); + return false; + } + try { + Optional portObject = deviceTransactionManager.getDataFromDevice(nodeId, + LogicalDatastoreType.OPERATIONAL, portIId, Timeouts.DEVICE_READ_TIMEOUT, + Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (!portObject.isPresent()) { return false; } - } else { - LOG.error("Impossible to update mapping"); + Ports port = portObject.get(); + Mapping newMapping = createMappingObject(nodeId, port, oldMapping.getSupportingCircuitPackName(), + oldMapping.getLogicalConnectionPoint()); + LOG.info("Updating old mapping Data {} for {} of {} by new mapping data {}", + oldMapping, oldMapping.getLogicalConnectionPoint(), nodeId, newMapping); + final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); + InstanceIdentifier mapIID = InstanceIdentifier.create(Network.class) + .child(Nodes.class, new NodesKey(nodeId)) + .child(Mapping.class, new MappingKey(oldMapping.getLogicalConnectionPoint())); + writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, mapIID, newMapping); + FluentFuture commit = writeTransaction.commit(); + commit.get(); + return true; + } catch (InterruptedException | ExecutionException e) { + LOG.error("Error updating Mapping {} for node {}", oldMapping.getLogicalConnectionPoint(), nodeId, e); return false; } } @@ -196,28 +208,24 @@ public class PortMappingVersion221 { Optional deviceObject = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - OrgOpenroadmDevice device = null; - if (deviceObject.isPresent()) { - device = deviceObject.get(); - } else { + if (!deviceObject.isPresent()) { LOG.error("Impossible to get device configuration for node {}", nodeId); return false; } + OrgOpenroadmDevice device = deviceObject.get(); + if (device.getCircuitPacks() == null) { + LOG.warn("Circuit Packs are not present for {}", nodeId); + return false; + } // Variable to keep track of number of line ports int line = 1; // Variable to keep track of number of client ports int client = 1; Map lcpMap = new HashMap<>(); Map mappingMap = new HashMap<>(); + List circuitPackList = new ArrayList<>(device.nonnullCircuitPacks().values()); + circuitPackList.sort(Comparator.comparing(CircuitPack::getCircuitPackName)); - List circuitPackList = null; - if (device.getCircuitPacks() == null) { - LOG.warn("Circuit Packs are not present for {}", nodeId); - return false; - } else { - circuitPackList = new ArrayList<>(deviceObject.get().getCircuitPacks()); - circuitPackList.sort(Comparator.comparing(CircuitPack::getCircuitPackName)); - } if (device.getXponder() == null) { LOG.warn("{} configuration does not contain a list of xponders", nodeId); for (CircuitPacks cp : circuitPackList) { @@ -226,7 +234,7 @@ public class PortMappingVersion221 { LOG.warn("Ports were not found for circuit pack: {}", circuitPackName); continue; } - List portList = new ArrayList<>(cp.getPorts()); + List portList = new ArrayList<>(cp.nonnullPorts().values()); portList.sort(Comparator.comparing(Ports::getPortName)); for (Ports port : portList) { if (port.getPortQual() == null) { @@ -250,11 +258,13 @@ public class PortMappingVersion221 { continue; } String lcp1 = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; - Optional cpOpt = circuitPackList.stream().filter(cP -> cP.getCircuitPackName() - .equals(port.getPartnerPort().getCircuitPackName())).findFirst(); + Optional cpOpt = circuitPackList.stream() + .filter(cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName())) + .findFirst(); if (cpOpt.isPresent()) { - Optional poOpt = cpOpt.get().getPorts().stream().filter(p -> p.getPortName() - .equals(port.getPartnerPort().getPortName().toString())).findFirst(); + Optional poOpt = cpOpt.get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .findFirst(); if (poOpt.isPresent()) { Ports port2 = poOpt.get(); if (checkPartnerPort(circuitPackName, port, port2)) { @@ -299,20 +309,40 @@ public class PortMappingVersion221 { } } else { LOG.info("{} configuration contains a list of xponders", nodeId); - for (Xponder xponder:deviceObject.get().getXponder()) { + for (Xponder xponder:deviceObject.get().nonnullXponder().values()) { line = 1; client = 1; Integer xponderNb = xponder.getXpdrNumber().toJava(); XpdrNodeTypes xponderType = xponder.getXpdrType(); - for (XpdrPort xpdrPort : xponder.getXpdrPort()) { + for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values()) { String circuitPackName = xpdrPort.getCircuitPackName(); String portName = xpdrPort.getPortName().toString(); - Ports port = device.getCircuitPacks().stream().filter(cp -> cp.getCircuitPackName() - .equals(circuitPackName)).findFirst().get().getPorts().stream().filter(p -> p.getPortName() - .equals(portName)).findFirst().get(); + // If there xponder-subtree has missing circuit-packs or ports, + // This gives a null-pointer expection, + if (device.nonnullCircuitPacks().values().stream() + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().isEmpty()) { + LOG.warn("Circuit-pack {} is missing in the device", circuitPackName); + LOG.warn("Port-mapping will continue ignoring this circuit-pack {}", circuitPackName); + continue; + } + if (device.nonnullCircuitPacks().values().stream() + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(portName)) + .findFirst().isEmpty()) { + LOG.warn("Port {} associated with CP {} is missing in the device", portName, circuitPackName); + LOG.warn("Port-mapping will continue ignoring this port {}", portName); + continue; + } + Ports port = device.nonnullCircuitPacks().values().stream() + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(portName)) + .findFirst().get(); if (port.getPortQual() == null) { LOG.warn("PortQual was not found for port {} on circuit pack: {}", port.getPortName(), - circuitPackName); + circuitPackName); continue; } if ((PortQual.XpdrNetwork.getIntValue() == port.getPortQual().getIntValue() @@ -320,8 +350,8 @@ public class PortMappingVersion221 { && port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { String lcp = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); - mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, - null, xponderType)); + mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, + null, null, null, xponderType)); line++; } else if ((PortQual.XpdrNetwork.getIntValue() == port.getPortQual().getIntValue() || PortQual.SwitchNetwork.getIntValue() == port.getPortQual().getIntValue()) @@ -334,11 +364,13 @@ public class PortMappingVersion221 { } String lcp1 = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; - Optional cpOpt = circuitPackList.stream().filter(cP -> cP.getCircuitPackName() - .equals(port.getPartnerPort().getCircuitPackName())).findFirst(); + Optional cpOpt = circuitPackList.stream() + .filter(cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName())) + .findFirst(); if (cpOpt.isPresent()) { - Optional poOpt = cpOpt.get().getPorts().stream().filter(p -> p.getPortName().equals( - port.getPartnerPort().getPortName().toString())).findFirst(); + Optional poOpt = cpOpt.get().nonnullPorts().values().stream() + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .findFirst(); if (poOpt.isPresent()) { Ports port2 = poOpt.get(); if (checkPartnerPort(circuitPackName, port, port2)) { @@ -346,22 +378,25 @@ public class PortMappingVersion221 { StringConstants.NETWORK_TOKEN).append(line + 1).toString(); if (!lcpMap.containsKey(lcp1) && !lcpMap.containsKey(lcp2)) { lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); - lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); + lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), + lcp2); mappingMap.put(lcp1, createXpdrMappingObject(nodeId, port, circuitPackName, lcp1, lcp2, null, null, xponderType)); mappingMap.put(lcp2, createXpdrMappingObject(nodeId, port2, cpOpt.get() - .getCircuitPackName(), lcp2, lcp1, null, null, xponderType)); + .getCircuitPackName(), lcp2, lcp1, null, null, + xponderType)); } else { LOG.warn("mapping already exists for {} or {}", lcp1, lcp2); } line += 2; } else { LOG.error("port {} on {} is not a correct partner port of {} on {}", port2 - .getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(), + .getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(), circuitPackName); } } else { - LOG.error("Error fetching port {} on {} for {}", port.getPartnerPort().getPortName(), + LOG.error("Error fetching port {} on {} for {}", + port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName(), nodeId); } } else { @@ -372,8 +407,8 @@ public class PortMappingVersion221 { || PortQual.SwitchClient.getIntValue() == port.getPortQual().getIntValue()) { String lcp = "XPDR" + xponderNb + "-" + StringConstants.CLIENT_TOKEN + client; lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); - mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, - null, null)); + mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, + null, null, null, null)); client++; } else { LOG.warn("Error in the configuration of port {} of {} for {}", port.getPortName(), @@ -383,41 +418,43 @@ public class PortMappingVersion221 { } } - if (device.getConnectionMap() != null) { - List connectionMap = deviceObject.get().getConnectionMap(); - String slcp = null; - String dlcp = null; + if (device.getConnectionMap() == null) { + LOG.warn("No connection-map inside device configuration"); + } else { + Collection connectionMap = deviceObject.get().nonnullConnectionMap().values(); for (ConnectionMap cm : connectionMap) { + String slcp = null; + String dlcp = null; String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName(); if (lcpMap.containsKey(skey)) { slcp = lcpMap.get(skey); } - String dkey = cm.getDestination().get(0).getCircuitPackName() + "+" - + cm.getDestination().get(0).getPortName(); + Destination destination0 = cm.nonnullDestination().values().iterator().next(); + String dkey = destination0.getCircuitPackName() + "+" + destination0.getPortName(); + if (slcp == null) { + LOG.error("Error in connection-map analysis for source {} and destination (circuitpack+port) {}", + skey, dkey); + continue; + } if (lcpMap.containsKey(dkey)) { dlcp = lcpMap.get(dkey); } - if (slcp != null) { - Mapping mapping = mappingMap.get(slcp); - mappingMap.remove(slcp); - portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp, null)); - } else { - LOG.error("Error in connection-map analysis"); - } + Mapping mapping = mappingMap.get(slcp); + mappingMap.remove(slcp); + portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp, null)); } - } else { - LOG.warn("No connection-map inside device configuration"); } + if (device.getOduSwitchingPools() != null) { - List oduSwithcingPools = device.getOduSwitchingPools(); + Collection oduSwithcingPools = device.nonnullOduSwitchingPools().values(); List switchingPoolList = new ArrayList<>(); for (OduSwitchingPools odp : oduSwithcingPools) { - List nblList = new ArrayList<>(); + Map nbMap = new HashMap<>(); for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org - .openroadm.device.odu.switching.pools.NonBlockingList nbl : odp.getNonBlockingList()) { + .openroadm.device.odu.switching.pools.NonBlockingList nbl : odp.nonnullNonBlockingList().values()) { List lcpList = new ArrayList<>(); if (nbl.getPortList() != null) { - for (PortList item : nbl.getPortList()) { + for (PortList item : nbl.nonnullPortList().values()) { String key = item.getCircuitPackName() + "+" + item.getPortName(); if (lcpMap.containsKey(key)) { lcpList.add(lcpMap.get(key)); @@ -432,17 +469,17 @@ public class PortMappingVersion221 { .setInterconnectBandwidthUnit(nbl.getInterconnectBandwidthUnit()) .setLcpList(lcpList) .build(); - nblList.add(nonBlockingList); + nbMap.put(nonBlockingList.key(), nonBlockingList); } } SwitchingPoolLcp splBldr = new SwitchingPoolLcpBuilder() .setSwitchingPoolNumber(odp.getSwitchingPoolNumber()) - .setSwitchingPoolType(odp.getSwitchingPoolType()) - .setNonBlockingList(nblList) + .setSwitchingPoolType(SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue())) + .setNonBlockingList(nbMap) .build(); switchingPoolList.add(splBldr); } - postPortMapping(nodeId, null, null, null, switchingPoolList); + postPortMapping(nodeId, null, null, null, switchingPoolList, null); } if (!mappingMap.isEmpty()) { @@ -473,6 +510,7 @@ public class PortMappingVersion221 { } } + private HashMap> getSrgCps(String deviceId, Info ordmInfo) { HashMap(); LOG.info("Getting Circuitpacks for Srg Number {}", srgCounter); InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(SharedRiskGroup.class, new SharedRiskGroupKey(srgCounter)); + .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))); Optional ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, srgIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (ordmSrgObject.isPresent()) { - srgCps.addAll(ordmSrgObject.get().getCircuitPacks()); + srgCps.addAll(ordmSrgObject.get().nonnullCircuitPacks().values()); cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps); } } @@ -509,7 +547,6 @@ public class PortMappingVersion221 { // Creating mapping data for SRG's PP HashMap> srgCps = getSrgCps(nodeId, deviceInfo); - for (Entry> srgCpEntry : srgCps.entrySet()) { List cpList = srgCps.get(srgCpEntry.getKey()); @@ -526,7 +563,7 @@ public class PortMappingVersion221 { LOG.warn("{} : Circuit pack {} not found or without ports.", nodeId, circuitPackName); continue; } - List portList = new ArrayList<>(circuitPackObject.get().getPorts()); + List portList = new ArrayList<>(circuitPackObject.get().nonnullPorts().values()); Collections.sort(portList, new SortPort221ByName()); int portIndex = 1; for (Ports port : portList) { @@ -539,7 +576,8 @@ public class PortMappingVersion221 { String logicalConnectionPoint = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName, port.getPortName(), logicalConnectionPoint); - portMapList.add(createMappingObject(nodeId, port, circuitPackName, logicalConnectionPoint)); + portMapList.add(createMappingObject(nodeId, port, circuitPackName, + logicalConnectionPoint)); portIndex++; keys.add(currentKey); } else if (PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() @@ -625,7 +663,7 @@ public class PortMappingVersion221 { for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) { LOG.info("Getting Connection ports for Degree Number {}", degreeCounter); InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Degree.class, new DegreeKey(degreeCounter)); + .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter))); Optional ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -637,6 +675,31 @@ public class PortMappingVersion221 { return degrees; } + private List getSrgs(String deviceId, Info ordmInfo) { + List srgs = new ArrayList<>(); + + Integer maxSrg; + // Get value for max Srg from info subtree, required for iteration + // if not present assume to be 20 (temporary) + if (ordmInfo.getMaxSrgs() != null) { + maxSrg = ordmInfo.getMaxSrgs().toJava(); + } else { + maxSrg = 20; + } + for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) { + InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))); + Optional ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId, + LogicalDatastoreType.OPERATIONAL, srgIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + if (ordmSrgObject.isPresent()) { + srgs.add(ordmSrgObject.get()); + + } + } + return srgs; + } + private Map> getPerDegreePorts(String deviceId, Info ordmInfo) { Map> conPortMap = new HashMap<>(); Integer maxDegree; @@ -649,12 +712,13 @@ public class PortMappingVersion221 { for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) { LOG.info("Getting Connection ports for Degree Number {}", degreeCounter); InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Degree.class, new DegreeKey(degreeCounter)); + .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter))); Optional ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (ordmDegreeObject.isPresent()) { - conPortMap.put(degreeCounter, ordmDegreeObject.get().getConnectionPorts()); + conPortMap.put(degreeCounter, new ArrayList<>(ordmDegreeObject.get() + .nonnullConnectionPorts().values())); } } LOG.info("Device {} has {} degree", deviceId, conPortMap.size()); @@ -671,7 +735,7 @@ public class PortMappingVersion221 { Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (protocolObject.isPresent() && protocolObject.get().augmentation(Protocols1.class).getLldp() != null) { Lldp lldp = protocolObject.get().augmentation(Protocols1.class).getLldp(); - for (PortConfig portConfig : lldp.getPortConfig()) { + for (PortConfig portConfig : lldp.nonnullPortConfig().values()) { if (portConfig.getAdminStatus().equals(PortConfig.AdminStatus.Txandrx)) { InstanceIdentifier interfaceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(Interface.class, new InterfaceKey(portConfig.getIfName())); @@ -707,7 +771,7 @@ public class PortMappingVersion221 { for (Degree degree : degrees) { if (degree.getCircuitPacks() != null) { LOG.info("Inside CP to degree list"); - cpToDegreeList.addAll(degree.getCircuitPacks().stream() + cpToDegreeList.addAll(degree.nonnullCircuitPacks().values().stream() .map(cp -> createCpToDegreeObject(cp.getCircuitPackName(), degree.getDegreeNumber().toString(), nodeId, interfaceList)) .collect(Collectors.toList())); @@ -716,29 +780,63 @@ public class PortMappingVersion221 { return cpToDegreeList; } + private List getMcCapabilitiesList(List degrees, List srgs, + String nodeId) { + LOG.info("Getting the MC capabilities for degrees of node {}", nodeId); + List mcCapabilitiesList = degrees.stream().map(degree -> + createMcCapDegreeObject(degree, nodeId)).collect(Collectors.toList()); + // Add the SRG mc-capabilities + LOG.info("Getting the MC capabilities for SRGs of node {}", nodeId); + mcCapabilitiesList.addAll(srgs.stream().map(srg -> createMcCapSrgObject(srg, nodeId)) + .collect(Collectors.toList())); + return mcCapabilitiesList; + } + private boolean postPortMapping(String nodeId, NodeInfo nodeInfo, List portMapList, - List cp2DegreeList, List splList) { + List cp2DegreeList, List splList, List mcCapList) { NodesBuilder nodesBldr = new NodesBuilder().withKey(new NodesKey(nodeId)).setNodeId(nodeId); if (nodeInfo != null) { nodesBldr.setNodeInfo(nodeInfo); } if (portMapList != null) { - nodesBldr.setMapping(portMapList); + Map mappingMap = new HashMap<>(); + for (Mapping mapping: portMapList) { + if (mapping != null) { + mappingMap.put(mapping.key(), mapping); + } + } + nodesBldr.setMapping(mappingMap); } if (cp2DegreeList != null) { - nodesBldr.setCpToDegree(cp2DegreeList); + Map cpToDegreeMap = new HashMap<>(); + for (CpToDegree cp2Degree: cp2DegreeList) { + if (cp2Degree != null) { + cpToDegreeMap.put(cp2Degree.key(), cp2Degree); + } + } + nodesBldr.setCpToDegree(cpToDegreeMap); } + if (splList != null) { - nodesBldr.setSwitchingPoolLcp(splList); + Map splMap = new HashMap<>(); + for (SwitchingPoolLcp spl: splList) { + if (spl != null) { + splMap.put(spl.key(), spl); + } + } + nodesBldr.setSwitchingPoolLcp(splMap); + } + if (mcCapList != null) { + nodesBldr.setMcCapabilities(mcCapList); } - List nodesList = new ArrayList<>(); - nodesList.add(nodesBldr.build()); + Map nodesList = new HashMap<>(); + Nodes nodes = nodesBldr.build(); + nodesList.put(nodes.key(),nodes); - NetworkBuilder nwBldr = new NetworkBuilder().setNodes(nodesList); + Network network = new NetworkBuilder().setNodes(nodesList).build(); final WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); InstanceIdentifier nodesIID = InstanceIdentifier.builder(Network.class).build(); - Network network = nwBldr.build(); writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, nodesIID, network); FluentFuture commit = writeTransaction.commit(); try { @@ -757,15 +855,66 @@ public class PortMappingVersion221 { interfaceName = interfaceList.get(circuitPackName); } return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName) - .setDegreeNumber(Long.valueOf(degreeNumber)).setInterfaceName(interfaceName).build(); + .setDegreeNumber(Uint32.valueOf(degreeNumber)).setInterfaceName(interfaceName).build(); + } + + private McCapabilities createMcCapDegreeObject(Degree degree, String nodeId) { + String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP"; + McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() + .withKey(new McCapabilitiesKey(mcNodeName)) + .setMcNodeName(mcNodeName); + if (degree.getMcCapabilities() != null) { + mcCapabilitiesBuilder + .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance(degree.getMcCapabilities() + .getCenterFreqGranularity().getValue().toString())) + .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance(degree.getMcCapabilities() + .getSlotWidthGranularity().getValue().toString())); + } + else { + LOG.warn("Media channel capabilities are not advertised for degree {} of {}", degree.getDegreeNumber(), + nodeId); + LOG.info("Assuming the fixed grid capabilities for degree {} of {}", degree.getDegreeNumber(), + nodeId); + mcCapabilitiesBuilder + .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50")) + .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50")); + } + return mcCapabilitiesBuilder.build(); + } + + private McCapabilities createMcCapSrgObject(SharedRiskGroup srg, String nodeId) { + String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP"; + McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() + .withKey(new McCapabilitiesKey(mcNodeName)) + .setMcNodeName(mcNodeName); + if (srg.getMcCapabilities() != null) { + mcCapabilitiesBuilder + .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance(srg.getMcCapabilities() + .getCenterFreqGranularity().getValue().toString())) + .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance(srg.getMcCapabilities() + .getSlotWidthGranularity().getValue().toString())); + } + else { + LOG.warn("Media channel capabilities are not advertised for SRG {} of {}", srg.getSrgNumber(), + nodeId); + LOG.info("Assuming the fixed grid capabilities for SRG {} of {}", srg.getSrgNumber(), + nodeId); + mcCapabilitiesBuilder + .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50")) + .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50")); + } + return mcCapabilitiesBuilder.build(); } private Mapping createMappingObject(String nodeId, Ports port, String circuitPackName, - String logicalConnectionPoint) { - MappingBuilder mpBldr = new MappingBuilder(); - mpBldr.withKey(new MappingKey(logicalConnectionPoint)).setLogicalConnectionPoint(logicalConnectionPoint) - .setSupportingCircuitPackName(circuitPackName).setSupportingPort(port.getPortName()) - .setPortDirection(port.getPortDirection().getName()); + String logicalConnectionPoint) { + + MappingBuilder mpBldr = new MappingBuilder() + .withKey(new MappingKey(logicalConnectionPoint)) + .setLogicalConnectionPoint(logicalConnectionPoint) + .setSupportingCircuitPackName(circuitPackName) + .setSupportingPort(port.getPortName()) + .setPortDirection(port.getPortDirection().getName()); // Get OMS and OTS interface provisioned on the TTP's if ((logicalConnectionPoint.contains(StringConstants.TTP_TOKEN) @@ -804,38 +953,53 @@ public class PortMappingVersion221 { private Mapping createXpdrMappingObject(String nodeId, Ports port, String circuitPackName, String logicalConnectionPoint, String partnerLcp, Mapping mapping, String connectionMapLcp, XpdrNodeTypes xpdrNodeType) { - MappingBuilder mpBldr; + if (mapping != null && connectionMapLcp != null) { // update existing mapping - mpBldr = new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp); - } else { - // create a new mapping - String nodeIdLcp = nodeId + logicalConnectionPoint; - mpBldr = new MappingBuilder() + return new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp).build(); + } + + // create a new mapping + String nodeIdLcp = nodeId + "-" + logicalConnectionPoint; + MappingBuilder mpBldr = new MappingBuilder() .withKey(new MappingKey(logicalConnectionPoint)) .setLogicalConnectionPoint(logicalConnectionPoint) .setSupportingCircuitPackName(circuitPackName) .setSupportingPort(port.getPortName()) .setPortDirection(port.getPortDirection().getName()) - // fnv hash is generated for the combination nodeID and logical connection point; used for SAPI/DAPI - .setLcpHashVal(fnv(nodeIdLcp)); - - if (port.getPortQual() != null) { - mpBldr.setPortQual(port.getPortQual().getName()); - } - if (port.getSupportedInterfaceCapability() != null) { - mpBldr.setSupportedInterfaceCapability(port.getSupportedInterfaceCapability()); - } - if (xpdrNodeType != null) { - mpBldr.setXponderType(xpdrNodeType); - } - if (partnerLcp != null) { - mpBldr.setPartnerLcp(partnerLcp); + .setLcpHashVal(FnvUtils.fnv1_64(nodeIdLcp)); + if (port.getPortQual() != null) { + mpBldr.setPortQual(port.getPortQual().getName()); + } + if (xpdrNodeType != null) { + mpBldr.setXponderType( + org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129 + .XpdrNodeTypes.forValue(xpdrNodeType.getIntValue())); + } + if (partnerLcp != null) { + mpBldr.setPartnerLcp(partnerLcp); + } + if (port.getSupportedInterfaceCapability() != null) { + List> supportedIntf = new ArrayList<>(); + for (Class sup: port.getSupportedInterfaceCapability()) { + Class sup1 = (Class) sup; + supportedIntf.add(sup1); } + mpBldr.setSupportedInterfaceCapability(supportedIntf); } return mpBldr.build(); } + private boolean createMcCapabilitiesList(String nodeId, Info deviceInfo, List mcCapabilitiesList) { + List degrees = getDegrees(nodeId, deviceInfo); + List srgs = getSrgs(nodeId, deviceInfo); + mcCapabilitiesList.addAll(getMcCapabilitiesList(degrees, srgs, nodeId)); + return true; + } + //some LOG messages are too long @SuppressWarnings("checkstyle:linelength") @SuppressFBWarnings("DM_CONVERT_CASE") @@ -845,7 +1009,7 @@ public class PortMappingVersion221 { Map interfaceList = getEthInterfaceList(nodeId); List cpToDegreeList = getCpToDegreeList(degrees, nodeId, interfaceList); LOG.info("Map looks like this {}", interfaceList); - postPortMapping(nodeId, null, null, cpToDegreeList, null); + postPortMapping(nodeId, null, null, cpToDegreeList, null, null); Map> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo); for (Entry> cpMapEntry : connectionPortMap.entrySet()) { @@ -874,7 +1038,8 @@ public class PortMappingVersion221 { connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port.getPortName(), logicalConnectionPoint); portMapList.add(createMappingObject(nodeId, port, - connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), logicalConnectionPoint)); + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), + logicalConnectionPoint)); } else { LOG.error( "Impossible to create logical connection point for port {} of {} on node {}" @@ -969,47 +1134,32 @@ public class PortMappingVersion221 { } private NodeInfo createNodeInfo(Info deviceInfo) { - NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder(); - if (deviceInfo.getNodeType() != null) { - nodeInfoBldr.setOpenroadmVersion(OpenroadmVersion._221).setNodeType(deviceInfo.getNodeType()); - if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) { - nodeInfoBldr.setNodeClli(deviceInfo.getClli()); - } else { - nodeInfoBldr.setNodeClli("defaultCLLI"); - } - if (deviceInfo.getModel() != null) { - nodeInfoBldr.setNodeModel(deviceInfo.getModel()); - } - if (deviceInfo.getVendor() != null) { - nodeInfoBldr.setNodeVendor(deviceInfo.getVendor()); - } - if (deviceInfo.getIpAddress() != null) { - nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress()); - } - } else { - // TODO make mandatory in yang + + if (deviceInfo.getNodeType() == null) { + // TODO make mandatory in yang LOG.error("Node type field is missing"); return null; } - return nodeInfoBldr.build(); - } - /** - * Implements the FNV-1 128bit algorithm. - * https://www.wikiwand.com/en/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#/FNV-1_hash - * https://github.com/pmdamora/fnv-cracker-app/blob/master/src/main/java/passwordcrack/cracking/HashChecker.java - * @param stringdata the String to be hashed - * @return the hash string - */ - private String fnv(String stringdata) { - BigInteger hash = FNV_INIT; - byte[] data = stringdata.getBytes(StandardCharsets.UTF_8); - - for (byte b : data) { - hash = hash.multiply(FNV_PRIME).mod(FNV_MOD); - hash = hash.xor(BigInteger.valueOf((int) b & 0xff)); + NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder() + .setOpenroadmVersion(OpenroadmVersion._221) + .setNodeType(NodeTypes.forValue(deviceInfo.getNodeType().getIntValue())); + if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) { + nodeInfoBldr.setNodeClli(deviceInfo.getClli()); + } else { + nodeInfoBldr.setNodeClli("defaultCLLI"); + } + if (deviceInfo.getModel() != null) { + nodeInfoBldr.setNodeModel(deviceInfo.getModel()); + } + if (deviceInfo.getVendor() != null) { + nodeInfoBldr.setNodeVendor(deviceInfo.getVendor()); + } + if (deviceInfo.getIpAddress() != null) { + nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress()); } - return hash.toString(16); + return nodeInfoBldr.build(); } + }