aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/so-bpmn-tasks
diff options
context:
space:
mode:
authorEnbo Wang <wangenbo@huawei.com>2020-03-14 20:19:13 +0800
committerEnbo Wang <wangenbo@huawei.com>2020-03-14 21:48:05 +0800
commite76bd8a61816cac18841f7b08c99f9047154697c (patch)
tree408dc3f49db2945465c9bbcba33c7b5765f24ba5 /bpmn/so-bpmn-tasks
parent7e2f7db5b4007fe470a7ce5794c88d1844021410 (diff)
Update parameter parsing of SDNC LCM client
Issue-ID: SO-2731 Signed-off-by: Enbo Wang <wangenbo@huawei.com> Change-Id: I4cb8b9d4efb7e3e78e7e242c04b316908987d9d7
Diffstat (limited to 'bpmn/so-bpmn-tasks')
-rw-r--r--bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SdncControllerDE.java39
1 files changed, 13 insertions, 26 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SdncControllerDE.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SdncControllerDE.java
index ed865e058f..8499b6f7d1 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SdncControllerDE.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SdncControllerDE.java
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.stereotype.Component;
import org.camunda.bpm.engine.delegate.DelegateExecution;
-import org.onap.so.bpmn.core.json.JsonUtils;
import org.onap.so.bpmn.infrastructure.decisionpoint.api.ControllerContext;
import org.onap.so.bpmn.infrastructure.decisionpoint.impl.camunda.controller.common.SoPropertyConstants;
import org.onap.so.bpmn.infrastructure.decisionpoint.impl.camunda.controller.LcmControllerDE;
@@ -102,13 +101,14 @@ public class SdncControllerDE extends LcmControllerDE {
}
private LcmOutput selectLcmOutputFromDmaapResponses(List<LcmDmaapResponse> lcmDmaapResponses, LcmInput lcmInput) {
- String expectedCorrelationId =
- lcmInput.getCommonHeader().getRequestId() + "-" + lcmInput.getCommonHeader().getSubRequestId();
+ String requestId = lcmInput.getCommonHeader().getRequestId();
+ String subRequestId = lcmInput.getCommonHeader().getSubRequestId();
for (LcmDmaapResponse lcmDmaapResponse : lcmDmaapResponses) {
- String correlationId = lcmDmaapResponse.getCorrelationId();
- if (expectedCorrelationId.equals(correlationId)) {
- return lcmDmaapResponse.getBody().getOutput();
+ LcmOutput lcmOutput = lcmDmaapResponse.getBody().getOutput();
+ if (requestId.equals(lcmOutput.getCommonHeader().getRequestId())
+ && subRequestId.equals(lcmOutput.getCommonHeader().getSubRequestId())) {
+ return lcmOutput;
}
}
@@ -204,15 +204,13 @@ public class SdncControllerDE extends LcmControllerDE {
return null;
}
- logger.debug("SDNC LCM payload for {}: {}", lcmAction, lcmPayload);
-
String subRequestId = UUID.randomUUID().toString();
LcmInput lcmInput =
SDNCLcmMessageBuilder.buildLcmInputForPnf(requestId, subRequestId, pnfName, lcmAction, lcmPayload);
ObjectMapper mapper = new ObjectMapper();
String lcmInputMsg = mapper.writeValueAsString(lcmInput);
- logger.debug("SDNC input message:\n" + lcmInputMsg);
+ logger.debug("SDNC input message for {}: {}", lcmAction, lcmInputMsg);
return lcmInput;
}
@@ -224,27 +222,16 @@ public class SdncControllerDE extends LcmControllerDE {
}
LcmStatus lcmStatus = lcmOutput.getStatus();
+ String outputPayload = lcmOutput.getPayload();
+ logger.debug("SDNC LCM output payload of action {}: {}", lcmAction, outputPayload);
if (lcmStatus.getCode() == SDNCConstants.LCM_OUTPUT_SUCCESS_CODE) {
- logger.debug("Call SDNC LCM API success: " + lcmStatus.getMessage());
+ logger.debug("Call SDNC LCM API for {} success, message: {}", lcmAction, lcmStatus.getMessage());
+ return true;
} else {
- logger.error("Call SDNC LCM API failure: " + lcmStatus.getMessage());
- }
-
- String outputPayload = lcmOutput.getPayload();
- logger.debug("SDNC LCM action: {}, result: {}", lcmAction, outputPayload);
- if (outputPayload != null) {
- String result = JsonUtils.getJsonValue(outputPayload, "result");
- if ("Success".equals(result)) {
- logger.debug("Run SDNC LCM action {} success", lcmAction);
- return true;
- } else {
- String reason = JsonUtils.getJsonValue(outputPayload, "reason");
- logger.error("Run SDNC LCM action {} failure, reason: {}", lcmAction, reason);
- }
+ logger.error("Call SDNC LCM API for {} failure, message: {}", lcmAction, lcmStatus.getMessage());
+ return false;
}
-
- return false;
}
private boolean sendLcmRequest(DelegateExecution execution, LcmInput lcmInput) {