diff options
author | 2021-03-19 19:46:58 +0000 | |
---|---|---|
committer | 2021-03-19 19:46:58 +0000 | |
commit | 35dfad30fe11b9a762371a00d512358395d70519 (patch) | |
tree | 0989e70bdfbd5943bed993c77e4c7d8eac3ec506 /ms/blueprintsprocessor/functions/python-executor/src | |
parent | 34861d2651488cef9d62c21364fe77a4b2ce8962 (diff) | |
parent | b96b44d6d7ca11dbbc3ad4bd2194df31fba5efb6 (diff) |
Merge "Refactoring to enable on_failure for imperative workflow"
Diffstat (limited to 'ms/blueprintsprocessor/functions/python-executor/src')
2 files changed, 4 insertions, 5 deletions
diff --git a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentJythonExecutor.kt b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentJythonExecutor.kt index 7911559ae..b32ccea13 100644 --- a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentJythonExecutor.kt +++ b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/python/executor/ComponentJythonExecutor.kt @@ -56,8 +56,7 @@ open class ComponentJythonExecutor( } override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) { - bluePrintRuntimeService.getBlueprintError() - .addError("Failed in ComponentJythonExecutor : ${runtimeException.message}") + addError("Failed in ComponentJythonExecutor : ${runtimeException.message}") } private suspend fun populateJythonComponentInstance() { 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 22154e5a0..539e03dc8 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 @@ -313,11 +313,11 @@ open class ComponentRemotePythonExecutor( } } - private fun noBlueprintErrors() = bluePrintRuntimeService.getBlueprintError().errors.isEmpty() + private fun noBlueprintErrors() = + bluePrintRuntimeService.getBlueprintError().stepErrors(stepName).isNullOrEmpty() override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) { - bluePrintRuntimeService.getBlueprintError() - .addError("Failed in ComponentRemotePythonExecutor : ${runtimeException.message}") + addError("Failed in ComponentRemotePythonExecutor : ${runtimeException.message}") } private fun formatNestedJsonNode(node: JsonNode): String { |