From fffa390c47e265c84d5bc755f480cb6d7974d4c5 Mon Sep 17 00:00:00 2001 From: Eltanany Shaaban Date: Thu, 3 Dec 2020 16:44:44 +0200 Subject: add toggle variable ansible fire failure to awx function Issue-ID: CCSDK-2366 Signed-off-by: Eltanany Shaaban Change-Id: I42b757c206c6d420ffa289cbe9e6c2b4dbf22b20 --- .../executor/ComponentRemoteAnsibleExecutor.kt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'ms/blueprintsprocessor/functions/ansible-awx-executor/src') diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt index 504757104..dccbe2e3c 100644 --- a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt +++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt @@ -75,6 +75,8 @@ open class ComponentRemoteAnsibleExecutor( // input fields names accepted by this executor const val INPUT_ENDPOINT_SELECTOR = "endpoint-selector" const val INPUT_JOB_TEMPLATE_NAME = "job-template-name" + const val ANSIBLE_FIRE_FAILURE = "ansible-fire-failure" + const val ANSIBLE_FAILED_STATUS = "failed" const val INPUT_WORKFLOW_JOB_TEMPLATE_NAME = "workflow-job-template-id" const val INPUT_LIMIT_TO_HOST = "limit" const val INPUT_INVENTORY = "inventory" @@ -102,10 +104,14 @@ open class ComponentRemoteAnsibleExecutor( jobTemplateName = getOperationInput(INPUT_WORKFLOW_JOB_TEMPLATE_NAME).asText() workflowURIPrefix = "workflow_" } + var isAnsibleFireFailure = false + if (getOptionalOperationInput(ANSIBLE_FIRE_FAILURE) != null) { + isAnsibleFireFailure = getOperationInput(ANSIBLE_FIRE_FAILURE).asBoolean() + } val jtId = lookupJobTemplateIDByName(restClientService, jobTemplateName, workflowURIPrefix) if (jtId.isNotEmpty()) { - runJobTemplateOnAWX(restClientService, jobTemplateName, jtId, workflowURIPrefix) + runJobTemplateOnAWX(restClientService, jobTemplateName, jtId, workflowURIPrefix, isAnsibleFireFailure) } else { val message = "Workflow/Job template $jobTemplateName does not exists" log.error(message) @@ -178,7 +184,8 @@ open class ComponentRemoteAnsibleExecutor( awxClient: BlueprintWebClientService, job_template_name: String?, jtId: String, - workflowPrefix: String + workflowPrefix: String, + isAnsibleFireFailure: Boolean ) { setNodeOutputProperties("preparing".asJsonPrimitive(), "".asJsonPrimitive(), "".asJsonPrimitive()) @@ -217,7 +224,13 @@ open class ComponentRemoteAnsibleExecutor( log.info("Execution of job template $job_template_name in job #$jobId finished with status ($jobStatus) for requestId $processId") - populateJobRunResponse(awxClient, jobId, workflowPrefix, jobStatus) + if (isAnsibleFireFailure && jobStatus == ANSIBLE_FAILED_STATUS) { + val message = "Execution of job template $job_template_name failed for requestId $processId." + " (Response: ${response.body}) " + log.error(message) + setNodeOutputErrors(ATTRIBUTE_EXEC_CMD_STATUS_ERROR, message) + } else { + populateJobRunResponse(awxClient, jobId, workflowPrefix, jobStatus) + } } else { // The job template requirements were not fulfilled with the values passed in. The message below will // provide more information via the response, like the ignored_fields, or variables_needed_to_start, -- cgit 1.2.3-korg