From d0a2e5c81e6512220e774d5c3ad11253d1e4c466 Mon Sep 17 00:00:00 2001 From: manuedelf Date: Thu, 8 Oct 2020 13:46:44 +0200 Subject: [PATCH] Technical debt - fix Renderer sonar issues JIRA: TRNSPRTPCE-213 Signed-off-by: guillaume.lambert Change-Id: Iadbd280f814b3ea7e9b8c55740bdb4a8698cdfc4 (cherry picked from commit 77743225e0c72a218d6606a2767c979bee61c5ef) --- .../OpenRoadmInterface221.java | 104 ++++++++---------- .../DeviceRendererServiceImpl.java | 7 +- .../tasks/OtnDeviceRenderingTask.java | 3 +- 3 files changed, 49 insertions(+), 65 deletions(-) diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java index fefbe0496..b5d84dfe4 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java @@ -22,6 +22,7 @@ import org.opendaylight.transportpce.common.mapping.PortMapping; 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.rev200827.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.McCapabilities; 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.FrequencyTHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.ModulationFormat; @@ -67,6 +68,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class OpenRoadmInterface221 { + private static final String MAPPING_ERROR_EXCEPTION_MESSAGE = + "Unable to get mapping from PortMapping for node % and logical connection port %s"; private final PortMapping portMapping; private final OpenRoadmInterfaces openRoadmInterfaces; private FixedFlexInterface fixedFlex; @@ -87,8 +90,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } // Ethernet interface specific data @@ -117,8 +119,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } List interfacesCreated = new ArrayList<>(); @@ -150,8 +151,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } List interfacesCreated = new ArrayList<>(); @@ -176,8 +176,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } // TODO : Check this method @@ -214,8 +213,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } // TODO : Check this method @@ -235,9 +233,7 @@ public class OpenRoadmInterface221 { new org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder() .setMcTtp(mcTtpBuilder.build()); - mcInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1.class, - interface1Builder.build()); + mcInterfaceBldr.addAugmentation(interface1Builder.build()); // Post interface on the device openRoadmInterfaces.postInterface(nodeId, mcInterfaceBldr); @@ -253,8 +249,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } LOG.info("Freq Start {} and Freq End {} and center-Freq {}", fixedFlex.getStart(), fixedFlex.getStop(), fixedFlex.getCenterFrequency()); @@ -291,8 +286,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } LOG.info("Freq Start {} and Freq End {} and center-Freq {}", flexGrid.getStart(), @@ -313,35 +307,29 @@ public class OpenRoadmInterface221 { else if (logicalConnPoint.contains("-TTP")) { mcLcp = logicalConnPoint.substring(0, logicalConnPoint.indexOf("-")) + "-TTP"; } - try { - double slotWidthGran = portMapping.getMcCapbilities(nodeId, mcLcp) - .getSlotWidthGranularity().getValue().doubleValue(); - - // Dead-band is constant (Ref: WP) - double deadBand = 8; // In GHz - double guardBand = Math.ceil(deadBand / slotWidthGran) * slotWidthGran; - - nmcCtpIfBuilder = new NmcCtpBuilder() + McCapabilities mcCapabilities = portMapping.getMcCapbilities(nodeId, mcLcp); + if (mcCapabilities == null || mcCapabilities.getSlotWidthGranularity() == null + || mcCapabilities.getSlotWidthGranularity().getValue() == null) { + LOG.warn("Port mapping could not find {}", mcLcp); + LOG.warn("Check the port mapping to verify {}", mcLcp); + return nmcInterfaceBldr.getName(); + } + double slotWidthGran = mcCapabilities.getSlotWidthGranularity().getValue().doubleValue(); + // Dead-band is constant (Ref: WP) In GHz + double deadBand = 8; + double guardBand = Math.ceil(deadBand / slotWidthGran) * slotWidthGran; + nmcCtpIfBuilder = new NmcCtpBuilder() .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(centerFrequency))) .setWidth(FrequencyGHz.getDefaultInstance(String.valueOf(slotWidth.doubleValue() - guardBand))); - // Create Interface1 type object required for adding as augmentation - org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1Builder - nmcCtpI1fBuilder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019 - .Interface1Builder().setNmcCtp(nmcCtpIfBuilder.build()); - nmcInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019 - .Interface1.class, nmcCtpI1fBuilder.build()); - - // Post interface on the device - openRoadmInterfaces.postInterface(nodeId, nmcInterfaceBldr); - - } - catch (NullPointerException e) { - LOG.error("Port mapping could not find {}", mcLcp); - LOG.error("Check the port mapping to verify {}", mcLcp); - } + // Create Interface1 type object required for adding as augmentation + org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1Builder + nmcCtpI1fBuilder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019 + .Interface1Builder().setNmcCtp(nmcCtpIfBuilder.build()); + nmcInterfaceBldr.addAugmentation(nmcCtpI1fBuilder.build()); + // Post interface on the device + openRoadmInterfaces.postInterface(nodeId, nmcInterfaceBldr); return nmcInterfaceBldr.getName(); } @@ -354,8 +342,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node %s and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } // OCH interface specific data @@ -426,9 +413,7 @@ public class OpenRoadmInterface221 { org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019.Interface1Builder ochIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019 .Interface1Builder(); - ochInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019.Interface1.class, - ochIf1Builder.setOch(ocIfBuilder.build()).build()); + ochInterfaceBldr.addAugmentation(ochIf1Builder.setOch(ocIfBuilder.build()).build()); // Post interface on the device openRoadmInterfaces.postInterface(nodeId, ochInterfaceBldr); @@ -446,7 +431,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, @@ -481,13 +466,11 @@ public class OpenRoadmInterface221 { Mapping portMapZ = portMapping.getMapping(znodeId, zlogicalConnPoint); if (portMapA == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - anodeId, alogicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, anodeId, alogicalConnPoint)); } if (portMapZ == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - znodeId, zlogicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, znodeId, zlogicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMapA, OtnOdu.class, alogicalConnPoint + "-ODU"); @@ -504,7 +487,8 @@ public class OpenRoadmInterface221 { .setOpu(opuBldr.build()) .setTxSapi(portMapA.getLcpHashVal()) .setTxDapi(portMapZ.getLcpHashVal()) - .setExpectedDapi(portMapA.getLcpHashVal()) // Setting the expected Dapi and Sapi values + // Setting the expected Dapi and Sapi values + .setExpectedDapi(portMapA.getLcpHashVal()) .setExpectedSapi(portMapZ.getLcpHashVal()); // Create Interface1 type object required for adding as augmentation @@ -577,7 +561,8 @@ public class OpenRoadmInterface221 { .setRate(OTU4.class) .setTxSapi(portMapA.getLcpHashVal()) .setTxDapi(portMapZ.getLcpHashVal()) - .setExpectedDapi(portMapA.getLcpHashVal()) // setting expected SAPI and DAPI values + // setting expected SAPI and DAPI values + .setExpectedDapi(portMapA.getLcpHashVal()) .setExpectedSapi(portMapZ.getLcpHashVal()); org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1Builder otuIf1Builder = @@ -702,8 +687,7 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + "-ODU4"); @@ -744,14 +728,12 @@ public class OpenRoadmInterface221 { Mapping portMapA = portMapping.getMapping(anodeId, alogicalConnPoint); if (portMapA == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - anodeId, alogicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, anodeId, alogicalConnPoint)); } Mapping portMapZ = portMapping.getMapping(znodeId, zlogicalConnPoint); if (portMapZ == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - znodeId, zlogicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, znodeId, zlogicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMapA, OtnOdu.class, alogicalConnPoint + "-ODU4"); diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java index 5796b27f9..8e2c89aac 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java @@ -77,6 +77,7 @@ import org.slf4j.LoggerFactory; public class DeviceRendererServiceImpl implements DeviceRendererService { + private static final String IS_NOT_MOUNTED_ON_THE_CONTROLLER = " is not mounted on the controller"; private static final String ODU4 = "-ODU4"; private static final Logger LOG = LoggerFactory.getLogger(DeviceRendererServiceImpl.class); private final DataBroker dataBroker; @@ -259,7 +260,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } } } else { - processErrorMessage(nodeId + " is not mounted on the controller", forkJoinPool, results); + processErrorMessage(nodeId + IS_NOT_MOUNTED_ON_THE_CONTROLLER, forkJoinPool, results); success.set(false); } } catch (OpenRoadmInterfaceException ex) { @@ -345,7 +346,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { if (this.deviceTransactionManager.isDeviceMounted(nodeId)) { interfacesToDelete.addAll(getInterfaces2delete(nodeId, srcTp, destTp, waveNumber)); } else { - String result = nodeId + " is not mounted on the controller"; + String result = nodeId + IS_NOT_MOUNTED_ON_THE_CONTROLLER; results.add(result); success.set(false); LOG.warn(result); @@ -621,7 +622,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { + input.getNodeId(); } } else { - result = input.getNodeId() + " is not mounted on the controller"; + result = input.getNodeId() + IS_NOT_MOUNTED_ON_THE_CONTROLLER; LOG.warn("{} is not mounted on the controller",input.getNodeId()); } return output.setResult(result).setSuccess(success).build(); diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java index 5c9e930c3..22396244d 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java @@ -37,7 +37,8 @@ public class OtnDeviceRenderingTask implements Callable(output.nonnullNodeInterface().values())); - } else { //false or null case + } else { + //false or null case LOG.warn("Device rendering not successfully finished."); return OtnDeviceRenderingResult.failed("Operation Failed"); } -- 2.36.6