From 2a3f659665153e32fdab4ef11102b7b8d06bf219 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Wed, 23 Jun 2021 10:16:47 +0200 Subject: [PATCH] Refactor: few renames in renderer Rename some methods links to transportpce yang models to be more explicit. JIRA: TRNSPRTPCE-490 Signed-off-by: Gilles Thouenon Change-Id: I7ddf7aebac80842473abf9051aa1a344e74a2073 --- .../transportpce/renderer/ModelMappingUtils.java | 8 ++++---- .../transportpce/renderer/NodeLists.java | 16 ++++++++-------- .../RendererServiceOperationsImpl.java | 4 ++-- .../tasks/DeviceRenderingTask.java | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java index d4445c884..09c6f3391 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java @@ -120,7 +120,7 @@ public final class ModelMappingUtils { ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder() .setServiceName(serviceName) .setOperation(Action.Create) - .setNodes(nodeLists.getList()) + .setNodes(nodeLists.getRendererNodeList()) .setWidth(new FrequencyGHz(GridConstant.WIDTH_40)); if (atoZDirection.getAToZWavelengthNumber() != null) { servicePathInputBuilder @@ -172,7 +172,7 @@ public final class ModelMappingUtils { ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder() .setOperation(Action.Create) .setServiceName(serviceName) - .setNodes(nodeLists.getList()) + .setNodes(nodeLists.getRendererNodeList()) .setWidth(new FrequencyGHz(GridConstant.WIDTH_40)); if (ztoADirection.getZToAWavelengthNumber() != null) { servicePathInputBuilder @@ -224,8 +224,8 @@ public final class ModelMappingUtils { if (!asideToZside) { nodeLists = getNodesListZtoA(pathDescription.getZToADirection().nonnullZToA().values().iterator()); } - LOG.info("These are node-lists {}, {}", nodeLists.getList(), nodeLists.getOlmList()); - for (Nodes node: nodeLists.getList()) { + LOG.info("These are node-lists {}, {}", nodeLists.getRendererNodeList(), nodeLists.getOlmNodeList()); + for (Nodes node: nodeLists.getRendererNodeList()) { nodes.add(new org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.otn.renderer.nodes .NodesBuilder() .setNodeId(node.getNodeId()) diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java index a36924525..e429daef4 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java @@ -12,20 +12,20 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618 public class NodeLists { - private List olmList; - private List list; + private List olmNodeList; + private List rendererNodelist; public NodeLists(List olmList, List list) { - this.olmList = olmList; - this.list = list; + this.olmNodeList = olmList; + this.rendererNodelist = list; } - public List getOlmList() { - return olmList; + public List getOlmNodeList() { + return olmNodeList; } - public List getList() { - return list; + public List getRendererNodeList() { + return rendererNodelist; } } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java index 59cdd31b2..f7158ad6a 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java @@ -142,7 +142,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations case StringConstants.SERVICE_TYPE_400GE: case StringConstants.SERVICE_TYPE_OTU4: case StringConstants.SERVICE_TYPE_OTUC4: - if (!createServicepathInput(input)) { + if (!manageServicePathCreation(input)) { return ModelMappingUtils.createServiceImplResponse(ResponseCodes.RESPONSE_FAILED, OPERATION_FAILED); } @@ -536,7 +536,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") - private boolean createServicepathInput(ServiceImplementationRequestInput input) { + private boolean manageServicePathCreation(ServiceImplementationRequestInput input) { ServicePathInputData servicePathInputDataAtoZ = ModelMappingUtils .rendererCreateServiceInputAToZ(input.getServiceName(), input.getPathDescription()); ServicePathInputData servicePathInputDataZtoA = ModelMappingUtils diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java index 329ed2186..fe83c8a9b 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java @@ -42,7 +42,7 @@ public class DeviceRenderingTask implements Callable { LOG.warn("Device rendering not successfully finished."); return DeviceRenderingResult.failed("Operation Failed"); } - List olmList = this.servicePathInputData.getNodeLists().getOlmList(); + List olmList = this.servicePathInputData.getNodeLists().getOlmNodeList(); LOG.info("Device rendering finished successfully."); return DeviceRenderingResult.ok(olmList, new ArrayList<>(output.nonnullNodeInterface().values())); } -- 2.36.6