From 577316e6c8fbf21bb25f41174cd80f7bd8df327a Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Tue, 12 Apr 2022 19:24:37 -0400 Subject: Return errormessages in failing imperative workflows Instead of discarding error messages after each node has executed, they are now kept until the workflow completes. If the workflow completes without exceptions, it means that all errors were handled and the error messages can be cleared. If the workflow does complete with exceptions, all error messages will be propagated in the response. Also update UatExecutor to enable expected status codes other than 200. Issue-ID: CCSDK-3630 Signed-off-by: Jozsef Csongvai Change-Id: I94fd81c342ad2a798e64051c603beb62bf1aaacd --- .../Definitions/uat-imperative-workflow.json | 24 +++++++++++++++++++ .../imperative_workflow/Tests/uat.yaml | 27 +++++++++++++++++++++- .../blueprintsprocessor/uat/utils/UatExecutor.kt | 3 ++- .../controllerblueprints/core/BluePrintError.kt | 2 ++ .../workflow/ImperativeWorkflowExecutionService.kt | 3 +-- 5 files changed, 55 insertions(+), 4 deletions(-) diff --git a/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Definitions/uat-imperative-workflow.json b/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Definitions/uat-imperative-workflow.json index 508d8b2e2..16466df85 100644 --- a/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Definitions/uat-imperative-workflow.json +++ b/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Definitions/uat-imperative-workflow.json @@ -112,6 +112,30 @@ } } } + }, + "uat-unhandled-error" : { + "steps" : { + "execute-A" : { + "target" : "execute-script-1", + "on_success" : [ "finalize" ], + "on_failure" : [ "clean-up" ] + }, + "finalize" : { + "target" : "execute-script-3" + }, + "clean-up" : { + "target" : "execute-script-4" + } + }, + "inputs" : { + "service-instance-id" : { + "type" : "string" + }, + "failing-steps" : { + "type" : "json" + } + }, + "outputs" : {} } }, "node_templates" : { diff --git a/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Tests/uat.yaml b/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Tests/uat.yaml index 3aab65e8a..693cad696 100644 --- a/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Tests/uat.yaml +++ b/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Tests/uat.yaml @@ -305,4 +305,29 @@ processes: execute-script-1: FAILED execute-script-2: FAILED execute-script-3: null - execute-script-4: SUCCEEDED \ No newline at end of file + execute-script-4: SUCCEEDED + + - name: uat-unhandled-error + request: + commonHeader: &ch + originatorId: sdnc + requestId: "1234" + subRequestId: "1234-12234" + actionIdentifiers: &ai + blueprintName: uat-imperative-workflow + blueprintVersion: "1.0.0" + actionName: uat-unhandled-error + mode: sync + payload: + uat-unhandled-error-request: + failing-steps: + execute-A: true + clean-up: true + expectedResponse: + commonHeader: *ch + actionIdentifiers: *ai + status: + code: 500 + eventType: EVENT_COMPONENT_FAILURE + errorMessage: "Step failed: execute-A, Step failed: clean-up, node(clean-up) outgoing edge(FAILURE) is missing." + message: failure \ No newline at end of file diff --git a/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatExecutor.kt b/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatExecutor.kt index 1e1d3ac2a..ae9b7d35c 100644 --- a/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatExecutor.kt +++ b/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatExecutor.kt @@ -241,7 +241,8 @@ class UatExecutor( } val response = client.execute(request) { response -> val statusLine = response.statusLine - assertThat("${process.name}", statusLine.statusCode, equalTo(HttpStatus.SC_OK)) + val expectedCode = expectedResponse?.get("status")?.get("code")?.intValue() + assertThat("${process.name}", statusLine.statusCode, equalTo(expectedCode ?: HttpStatus.SC_OK)) val entity = response.entity assertThat("${process.name} Response contains no content", entity, notNullValue()) entity.content.bufferedReader().use { it.readText() } diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintError.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintError.kt index 1ac49d6fe..18dcd16f7 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintError.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintError.kt @@ -35,4 +35,6 @@ class BluePrintError { fun allErrors(): List = errors.values.flatten() fun stepErrors(stepName: String): MutableList? = errors[stepName] + + fun clearAll() = errors.clear(); } diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/ImperativeWorkflowExecutionService.kt b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/ImperativeWorkflowExecutionService.kt index b8350f4f1..fbe51acae 100644 --- a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/ImperativeWorkflowExecutionService.kt +++ b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/ImperativeWorkflowExecutionService.kt @@ -119,6 +119,7 @@ open class ImperativeBluePrintWorkflowService(private val nodeTemplateExecutionS } message = BluePrintConstants.STATUS_FAILURE } else { + bluePrintRuntimeService.getBluePrintError().clearAll() message = BluePrintConstants.STATUS_SUCCESS } eventType = EventType.EVENT_COMPONENT_EXECUTED.name @@ -163,8 +164,6 @@ open class ImperativeBluePrintWorkflowService(private val nodeTemplateExecutionS .executeNodeTemplate(bluePrintRuntimeService, node.id, nodeTemplateName, nodeInput) if (executionServiceOutput.status.message == BluePrintConstants.STATUS_FAILURE) { - // Clear step errors so that the workflow does not fail - bluePrintRuntimeService.getBluePrintError().stepErrors(node.id)?.clear() return EdgeLabel.FAILURE } -- cgit 1.2.3-korg