From 3aee5e83b7f76abaddba285f7a9e4409da155643 Mon Sep 17 00:00:00 2001 From: Sumapriya Date: Mon, 23 Apr 2018 15:31:07 +0530 Subject: Sonar Major Bug Fixing File: MsoVnfAdapterImpl.java Sonar Link: https://sonar.onap.org/project/issues?assigned=false&id=org.onap.so%3Aso&open=AWHCr-UwEU5FCDfKtmD4&resolved=false&rules=squid%3AS1481&severities=MAJOR Location: src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java Line No:L1888 File: E2EServiceInstances.java Sonar Link: https://sonar.onap.org/project/issues?assigned=false&id=org.onap.so%3Aso&open=AWHCr-iMEU5FCDfKtmO-&resolved=false&rules=squid%3AS1481&severities=MAJOR Location: src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java Line No:L1326 File: MsoRequest.java Sonar Link: https://sonar.onap.org/project/issues?assigned=false&id=org.onap.so%3Aso&open=AWHCr-jXEU5FCDfKtmSQ&resolved=false&rules=squid%3AS1481&severities=MAJOR Location: src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java Line No:L916 File: SdncUnderlayVpnOperationClient.java Sonar Link: https://sonar.onap.org/project/issues?assigned=false&id=org.onap.so%3Aso&open=AWIP10X8RGy6eclHDJ5J&resolved=false&rules=squid%3AS1481&severities=MAJOR Location: src/main/java/org/opencomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java Line No:L70 Change-Id: Id2548cb7e9ef2a916d5adbd93fa5ded4fba6d7ab Issue-ID: SO-582 Signed-off-by: Sumapriya --- .../main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java | 2 +- .../workflow/serviceTask/SdncUnderlayVpnOperationClient.java | 2 +- .../java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java | 2 +- .../src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java index f8cba6afcb..48e0a56ef1 100644 --- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java +++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java @@ -1885,7 +1885,7 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter { // Also new in 1510 - don't flag missing parameters if there's an environment - because they might be there. // And also new - add parameter to turn off checking all together if we find we're blocking orders we // shouldn't - boolean haveEnvironmentParameters = false; +// boolean haveEnvironmentParameters = false; boolean checkRequiredParameters = true; try { String propertyString = msoPropertiesFactory.getMsoJavaProperties(MSO_PROP_VNF_ADAPTER) diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java index 2bca17a9ca..0e7904c87c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java +++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java @@ -67,7 +67,7 @@ public class SdncUnderlayVpnOperationClient { NetworkRpcInputEntityBuilder builder = new NetworkRpcInputEntityBuilder(); RpcNetworkTopologyOperationInputEntity body = builder.build(null, inputs); updateProgress(null, null, "50", "RequestBody build finished!"); - RpcNetworkTopologyOperationOutputEntity networkRpcOutputEntiy = null; + //RpcNetworkTopologyOperationOutputEntity networkRpcOutputEntiy = null; try { genericResourceApiClient.postNetworkTopologyOperation(HeaderUtil.DefaulAuth ,body).execute().body(); } catch (Exception e) { diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java index 95da5b6a95..e0e13e7884 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java @@ -1318,7 +1318,7 @@ public class E2EServiceInstances { requestParameters.setSubscriptionServiceType("MOG"); // Userparams - List userParams; + //List userParams; // userParams = // e2eSir.getService().getParameters().getRequestParameters().getUserParams(); List> userParamList = new ArrayList<>(); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java index 59c78b5439..2f2ef313f4 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java @@ -913,9 +913,8 @@ public class MsoRequest { } public void updateFinalStatus (Status status) { - int result = 0; try { - result = (RequestsDatabase.getInstance()).updateInfraFinalStatus (requestId, + (RequestsDatabase.getInstance()).updateInfraFinalStatus (requestId, status.toString (), this.errorMessage, this.progress, -- cgit 1.2.3-korg