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=3046aca4d61e781b690a41af095c843ffab53803;hb=d5b35044e42b9db01e2cc8472fb7b45fe224319d;hp=4dcea0ae6602a022c23b5afbc29bab7751f3e520;hpb=e5480799d2f666999f2ae5cd7a874aa78d648a60;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 4dcea0ae6..3046aca4d 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 @@ -9,12 +9,17 @@ 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.Base64; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @@ -28,25 +33,29 @@ 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.rev200113.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.NetworkBuilder; -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.NodesBuilder; -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.CpToDegreeBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeKey; -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.rev200113.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfoBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.SwitchingPoolLcp; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.SwitchingPoolLcpBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.switching.pool.lcp.NonBlockingList; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.switching.pool.lcp.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.McCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.McCapabilitiesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.SwitchingPoolLcp; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.SwitchingPoolLcpBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.switching.pool.lcp.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.switching.pool.lcp.NonBlockingListBuilder; 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.FrequencyGHz; 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; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CircuitPack; @@ -73,19 +82,26 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.xponder. 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; +import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OtnOdu; 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.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; public class PortMappingVersion221 { - private static final Logger LOG = LoggerFactory.getLogger(PortMappingImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion221.class); private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; private final OpenRoadmInterfaces openRoadmInterfaces; + //FNV1 64 bit hash constants + private static final BigInteger FNV_PRIME = new BigInteger("100000001b3", 16); + private static final BigInteger FNV_INIT = new BigInteger("cbf29ce484222325", 16); + private static final BigInteger FNV_MOD = new BigInteger("2").pow(64); public PortMappingVersion221(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, OpenRoadmInterfaces openRoadmInterfaces) { @@ -97,23 +113,23 @@ 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); + 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 { + if (!deviceInfoOptional.isPresent()) { LOG.warn("Device info subtree is absent for {}", nodeId); return false; } + deviceInfo = deviceInfoOptional.get(); + nodeInfo = createNodeInfo(deviceInfo, nodeId); + if (nodeInfo == null) { + return false; + } + postPortMapping(nodeId, nodeInfo, null, null, null, null); switch (deviceInfo.getNodeType()) { @@ -131,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)) { @@ -143,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) { - LOG.info("Updating Mapping Data {} for node {}", oldMapping, nodeId); 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()); - - 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; } } @@ -188,12 +209,11 @@ public class PortMappingVersion221 { 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; } + device = deviceObject.get(); // Variable to keep track of number of line ports int line = 1; // Variable to keep track of number of client ports @@ -205,10 +225,10 @@ public class PortMappingVersion221 { if (device.getCircuitPacks() == null) { LOG.warn("Circuit Packs are not present for {}", nodeId); return false; - } else { - circuitPackList = deviceObject.get().getCircuitPacks(); - circuitPackList.sort(Comparator.comparing(CircuitPack::getCircuitPackName)); } + 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) { @@ -217,7 +237,7 @@ public class PortMappingVersion221 { LOG.warn("Ports were not found for circuit pack: {}", circuitPackName); continue; } - List portList = cp.getPorts(); + List portList = new ArrayList<>(cp.getPorts()); portList.sort(Comparator.comparing(Ports::getPortName)); for (Ports port : portList) { if (port.getPortQual() == null) { @@ -241,11 +261,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().getPorts().stream() + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .findFirst(); if (poOpt.isPresent()) { Ports port2 = poOpt.get(); if (checkPartnerPort(circuitPackName, port, port2)) { @@ -293,17 +315,37 @@ public class PortMappingVersion221 { for (Xponder xponder:deviceObject.get().getXponder()) { line = 1; client = 1; - Integer xponderNb = xponder.getXpdrNumber(); + Integer xponderNb = xponder.getXpdrNumber().toJava(); XpdrNodeTypes xponderType = xponder.getXpdrType(); for (XpdrPort xpdrPort : xponder.getXpdrPort()) { 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.getCircuitPacks().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.getCircuitPacks().stream() + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().get().getPorts().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.getCircuitPacks().stream() + .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)) + .findFirst().get().getPorts().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() @@ -311,8 +353,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()) @@ -325,11 +367,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().getPorts().stream() + .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString())) + .findFirst(); if (poOpt.isPresent()) { Ports port2 = poOpt.get(); if (checkPartnerPort(circuitPackName, port, port2)) { @@ -337,22 +381,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 { @@ -363,8 +410,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(), @@ -433,7 +480,7 @@ public class PortMappingVersion221 { .build(); switchingPoolList.add(splBldr); } - postPortMapping(nodeId, null, null, null, switchingPoolList); + postPortMapping(nodeId, null, null, null, switchingPoolList, null); } if (!mappingMap.isEmpty()) { @@ -464,6 +511,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()); - cpPerSrg.put(ordmSrgObject.get().getSrgNumber(), srgCps); + cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps); } } LOG.info("Device {} has {} Srg", deviceId, cpPerSrg.size()); @@ -500,10 +548,9 @@ public class PortMappingVersion221 { // Creating mapping data for SRG's PP HashMap> srgCps = getSrgCps(nodeId, deviceInfo); - - for (Integer k : srgCps.keySet()) { + for (Entry> srgCpEntry : srgCps.entrySet()) { List cpList = - srgCps.get(k); + srgCps.get(srgCpEntry.getKey()); List keys = new ArrayList<>(); for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg.CircuitPacks cp : cpList) { String circuitPackName = cp.getCircuitPackName(); @@ -517,7 +564,7 @@ public class PortMappingVersion221 { LOG.warn("{} : Circuit pack {} not found or without ports.", nodeId, circuitPackName); continue; } - List portList = circuitPackObject.get().getPorts(); + List portList = new ArrayList<>(circuitPackObject.get().getPorts()); Collections.sort(portList, new SortPort221ByName()); int portIndex = 1; for (Ports port : portList) { @@ -527,10 +574,11 @@ public class PortMappingVersion221 { } else if (PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() && Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue() && !keys.contains(currentKey)) { - String logicalConnectionPoint = createLogicalConnectionPort(port, k, portIndex); + 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() @@ -538,7 +586,7 @@ public class PortMappingVersion221 { || Direction.Tx.getIntValue() == port.getPortDirection().getIntValue()) && !keys.contains(currentKey) && port.getPartnerPort() != null) { - String logicalConnectionPoint1 = createLogicalConnectionPort(port, k, portIndex); + String logicalConnectionPoint1 = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName, port.getPortName(), logicalConnectionPoint1); InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) @@ -552,7 +600,7 @@ public class PortMappingVersion221 { == PortQual.RoadmExternal.getIntValue()) { Ports port2 = port2Object.get(); if (checkPartnerPort(circuitPackName, port, port2)) { - String logicalConnectionPoint2 = createLogicalConnectionPort(port2, k, portIndex); + String logicalConnectionPoint2 = createLogicalConnectionPort(port2, srgCpEntry.getKey(), portIndex); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName, port2.getPortName(), logicalConnectionPoint2); portMapList.add(createMappingObject(nodeId, port, circuitPackName, @@ -608,7 +656,7 @@ public class PortMappingVersion221 { // Get value for max degree from info subtree, required for iteration // if not present assume to be 20 (temporary) if (ordmInfo.getMaxDegrees() != null) { - maxDegree = ordmInfo.getMaxDegrees(); + maxDegree = ordmInfo.getMaxDegrees().toJava(); } else { maxDegree = 20; } @@ -616,7 +664,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); @@ -624,23 +672,48 @@ public class PortMappingVersion221 { degrees.add(ordmDegreeObject.get()); } } - LOG.info("Device {} has {} degree", degrees.size()); + LOG.info("Device {} has {} degree", deviceId, degrees.size()); 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; if (ordmInfo.getMaxDegrees() != null) { - maxDegree = ordmInfo.getMaxDegrees(); + maxDegree = ordmInfo.getMaxDegrees().toJava(); } else { maxDegree = 20; } 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); @@ -707,8 +780,20 @@ 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); @@ -722,6 +807,9 @@ public class PortMappingVersion221 { if (splList != null) { nodesBldr.setSwitchingPoolLcp(splList); } + if (mcCapList != null) { + nodesBldr.setMcCapabilities(mcCapList); + } List nodesList = new ArrayList<>(); nodesList.add(nodesBldr.build()); @@ -748,7 +836,51 @@ public class PortMappingVersion221 { interfaceName = interfaceList.get(circuitPackName); } return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName) - .setDegreeNumber(new Long(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(degree.getMcCapabilities().getCenterFreqGranularity()) + .setSlotWidthGranularity(degree.getMcCapabilities().getSlotWidthGranularity()); + } + 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(srg.getMcCapabilities().getCenterFreqGranularity()) + .setSlotWidthGranularity(srg.getMcCapabilities().getSlotWidthGranularity()); + } + 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, @@ -759,12 +891,15 @@ public class PortMappingVersion221 { .setPortDirection(port.getPortDirection().getName()); // Get OMS and OTS interface provisioned on the TTP's - if (logicalConnectionPoint.contains(StringConstants.TTP_TOKEN) && (port.getInterfaces() != null)) { + if ((logicalConnectionPoint.contains(StringConstants.TTP_TOKEN) + || logicalConnectionPoint.contains(StringConstants.NETWORK_TOKEN)) && (port.getInterfaces() != null)) { for (Interfaces interfaces : port.getInterfaces()) { try { Optional openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId, interfaces.getInterfaceName()); if (openRoadmInterface.isPresent()) { + LOG.info("interface get from device is {} and of type {}", openRoadmInterface.get().getName(), + openRoadmInterface.get().getType()); Class interfaceType = (Class) openRoadmInterface.get().getType(); // Check if interface type is OMS or OTS @@ -774,6 +909,9 @@ public class PortMappingVersion221 { if (interfaceType.equals(OpticalTransport.class)) { mpBldr.setSupportingOts(interfaces.getInterfaceName()); } + if (interfaceType.equals(OtnOdu.class)) { + mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); + } } else { LOG.warn("Interface {} from node {} was null!", interfaces.getInterfaceName(), nodeId); } @@ -795,12 +933,15 @@ public class PortMappingVersion221 { mpBldr = new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp); } else { // create a new mapping + String nodeIdLcp = nodeId + "-" + logicalConnectionPoint; mpBldr = new MappingBuilder() .withKey(new MappingKey(logicalConnectionPoint)) .setLogicalConnectionPoint(logicalConnectionPoint) .setSupportingCircuitPackName(circuitPackName) .setSupportingPort(port.getPortName()) - .setPortDirection(port.getPortDirection().getName()); + .setPortDirection(port.getPortDirection().getName()) + .setLcpHashVal(fnv(nodeIdLcp)); + if (port.getPortQual() != null) { mpBldr.setPortQual(port.getPortQual().getName()); } @@ -817,28 +958,38 @@ public class PortMappingVersion221 { 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") private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List portMapList) { // Creating mapping data for degree TTP's List degrees = getDegrees(nodeId, deviceInfo); 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 (Integer k : connectionPortMap.keySet()) { - switch (connectionPortMap.get(k).size()) { + for (Entry> cpMapEntry : connectionPortMap.entrySet()) { + switch (connectionPortMap.get(cpMapEntry.getKey()).size()) { case 1: // port is bidirectional InstanceIdentifier portID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(connectionPortMap.get(k).get(0) + .child(CircuitPacks.class, new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0) .getCircuitPackName())) - .child(Ports.class, new PortsKey(connectionPortMap.get(k).get(0) + .child(Ports.class, new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0) .getPortName().toString())); - LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(k).get(0) - .getPortName().toString(), connectionPortMap.get(k).get(0).getCircuitPackName()); + LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(cpMapEntry.getKey()).get(0) + .getPortName().toString(), connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()); Optional portObject = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, portID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -848,43 +999,44 @@ public class PortMappingVersion221 { continue; } else if (PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue() && Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue()) { - String logicalConnectionPoint = new StringBuilder("DEG").append(k).append("-TTP-TXRX") + String logicalConnectionPoint = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-TXRX") .toString(); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, - connectionPortMap.get(k).get(0).getCircuitPackName(), port.getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port.getPortName(), logicalConnectionPoint); portMapList.add(createMappingObject(nodeId, port, - connectionPortMap.get(k).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 {}" + "- Error in configuration with port-qual or port-direction", - port.getPortName(), connectionPortMap.get(k).get(0).getCircuitPackName(), nodeId); + port.getPortName(), connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); } } else { LOG.error("No port {} on circuit pack {} for node {}", - connectionPortMap.get(k).get(0).getPortName().toString(), - connectionPortMap.get(k).get(0).getCircuitPackName(), nodeId); + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); return false; } break; case 2: // ports are unidirectionals - String cp1Name = connectionPortMap.get(k).get(0).getCircuitPackName(); - String cp2Name = connectionPortMap.get(k).get(1).getCircuitPackName(); + String cp1Name = connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(); + String cp2Name = connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(); InstanceIdentifier port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp1Name)) - .child(Ports.class, new PortsKey(connectionPortMap.get(k).get(0).getPortName().toString())); - LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(k).get(0) + .child(Ports.class, new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString())); + LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(cpMapEntry.getKey()).get(0) .getPortName().toString(), cp1Name); Optional port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port1ID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); InstanceIdentifier port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(cp2Name)) - .child(Ports.class, new PortsKey(connectionPortMap.get(k).get(1).getPortName().toString())); + .child(Ports.class, new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString())); LOG.info("Fetching connection-port {} at circuit pack {}", - connectionPortMap.get(k).get(1).getPortName().toString(), cp2Name); + connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString(), cp2Name); Optional port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -899,7 +1051,7 @@ public class PortMappingVersion221 { && Direction.Tx.getIntValue() == port2.getPortDirection().getIntValue() && port1.getPartnerPort() != null && port2.getPartnerPort() != null && port1.getPartnerPort().getCircuitPackName().equals(cp2Name) - && port1.getPartnerPort().getPortName().equals(port2.getPortName().toString()) + && port1.getPartnerPort().getPortName().equals(port2.getPortName()) && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) && port2.getPartnerPort().getPortName().equals(port1.getPortName())) || @@ -909,22 +1061,22 @@ public class PortMappingVersion221 { && Direction.Tx.getIntValue() == port1.getPortDirection().getIntValue() && port1.getPartnerPort() != null && port2.getPartnerPort() != null && port1.getPartnerPort().getCircuitPackName().equals(cp2Name) - && port1.getPartnerPort().getPortName().equals(port2.getPortName().toString()) + && port1.getPartnerPort().getPortName().equals(port2.getPortName()) && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) - && port2.getPartnerPort().getPortName().equals(port1.getPortName().toString()))) { - String logicalConnectionPoint1 = new StringBuilder("DEG").append(k).append("-TTP-") + && port2.getPartnerPort().getPortName().equals(port1.getPortName()))) { + String logicalConnectionPoint1 = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-") .append(port1.getPortDirection().getName().toUpperCase()).toString(); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, - connectionPortMap.get(k).get(0).getCircuitPackName(), port1.getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port1.getPortName(), logicalConnectionPoint1); - portMapList.add(createMappingObject(nodeId, port1, connectionPortMap.get(k).get(0) + portMapList.add(createMappingObject(nodeId, port1, connectionPortMap.get(cpMapEntry.getKey()).get(0) .getCircuitPackName(), logicalConnectionPoint1)); - String logicalConnectionPoint2 = new StringBuilder("DEG").append(k).append("-TTP-") + String logicalConnectionPoint2 = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-") .append(port2.getPortDirection().getName().toUpperCase()).toString(); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, - connectionPortMap.get(k).get(1).getCircuitPackName(), port2.getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(), port2.getPortName(), logicalConnectionPoint2); - portMapList.add(createMappingObject(nodeId, port2, connectionPortMap.get(k).get(1) + portMapList.add(createMappingObject(nodeId, port2, connectionPortMap.get(cpMapEntry.getKey()).get(1) .getCircuitPackName(), logicalConnectionPoint2)); } else { LOG.error( @@ -934,46 +1086,68 @@ public class PortMappingVersion221 { } } else { LOG.error("No port {} on circuit pack {} for node {}", - connectionPortMap.get(k).get(0).getPortName().toString(), - connectionPortMap.get(k).get(0).getCircuitPackName(), nodeId); + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); return false; } break; default: - LOG.error("Number of connection port for DEG{} on {} is incorrect", k, nodeId); + LOG.error("Number of connection port for DEG{} on {} is incorrect", cpMapEntry.getKey(), nodeId); continue; } } return true; } - private NodeInfo createNodeInfo(Info deviceInfo) { + private NodeInfo createNodeInfo(Info deviceInfo, String nodeId) { NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder(); - if (deviceInfo.getNodeType() != null) { - nodeInfoBldr = new NodeInfoBuilder() - .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; } + + 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()); + } + return nodeInfoBldr.build(); } + /** + * Implements the FNV-1 64bit algorithm. + * FNV-1 128bit would be ideal for 16 bytes but we need an overhead for Base64 encoding. + * Otherwise, the hash cannot be stored in a UTF-8 string. + * 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)); + } + + return Base64.getEncoder().encodeToString(hash.toByteArray()); + } }