diff options
| author |   Oleg Mitsura <oleg.mitsura@amdocs.com> | 2021-11-23 09:23:44 -0500 |
|---|---|---|
| committer | Oleg Mitsura <oleg.mitsura@amdocs.com> | 2021-11-30 07:08:10 -0500 |
| commit | c5684c3e3a81d58eedc3dbee3d943ba20c6ddfa5 (patch) | |
| tree | d5723abaa74498da933299e3887ca25d7717ecc4 /ms/blueprintsprocessor/functions/python-executor/src | |
| parent | 886d02197ce3a6b3ecb0c40d191e649b23e3bb91 (diff) | |
CCSDK-3531 improve cmd-exec returned err msg
Issue-ID: CCSDK-3531
Improve end-user CBA's Python scripts ability to return
error messages on failues.
See JIRA story for examples: https://jira.onap.org/browse/CCSDK-3531
adds functions send_response_err_msg(err_message)
and send_response_err_msg_and_exit(ret_err_msg, code=1)
Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: Ideda64dd108f987c3c4515c70daf9f7b6d2b1f2f
Diffstat (limited to 'ms/blueprintsprocessor/functions/python-executor/src')
| -rw-r--r-- | ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutor.kt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutor.kt b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutor.kt index 00f8e5a19..eaefde7ce 100644 --- a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutor.kt +++ b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentRemotePythonExecutor.kt @@ -209,11 +209,15 @@ open class ComponentRemotePythonExecutor( } val logs = JacksonUtils.jsonNodeFromObject(remoteExecutionOutput.response) val returnedPayload = remoteExecutionOutput.payload + val returnedErrMsg = remoteExecutionOutput.errMsg // In case of execution, `payload` (dictionary from Python execution) is preserved in `remoteExecutionOutput.payload`; // It would contain `err_msg` key. It is valid to return it. if (remoteExecutionOutput.status != StatusType.SUCCESS) { setNodeOutputErrors(STEP_EXEC_CMD, logs, returnedPayload, isLogResponseEnabled) - addError(StatusType.FAILURE.name, STEP_EXEC_CMD, logs.toString()) + // check if the payload is set (in case user Python script handles the error and sets the payload to return + val retErrMsg: String = if (returnedErrMsg.isNullOrEmpty()) "cmd-exec has failed, please see cmd-exec log for more details." + else "cmd-exec failed and returned: $returnedErrMsg" + addError(StatusType.FAILURE.name, STEP_EXEC_CMD, retErrMsg) } else { setNodeOutputProperties(remoteExecutionOutput.status, STEP_EXEC_CMD, logs, returnedPayload, isLogResponseEnabled) } // In timeout exception cases, we don't have payload, hence `payload` is empty value. |