From 7466e4277c9fe098a61ae126d1892b3cd30d6f89 Mon Sep 17 00:00:00 2001 From: Brinda Santh Date: Mon, 2 Dec 2019 19:04:13 -0500 Subject: Remote Script Executor Component Define and Implement component-remote-script-executor component and DSL. Get the timeout from model definitions fix the dat pattern issues Define API data extension functions. Issue-ID: CCSDK-1975 Signed-off-by: Brinda Santh Change-Id: I41a429eb21a050e5ab512a7a73a394b975543f31 --- .../services/workflow/NodeTemplateExecutionService.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ms/blueprintsprocessor/modules/services/workflow-service/src') diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/NodeTemplateExecutionService.kt b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/NodeTemplateExecutionService.kt index 615a31c77..6a304e0c7 100644 --- a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/NodeTemplateExecutionService.kt +++ b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/NodeTemplateExecutionService.kt @@ -23,6 +23,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.StepData import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractComponentFunction import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive +import org.onap.ccsdk.cds.controllerblueprints.core.data.Implementation import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintDependencyService import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService import org.slf4j.LoggerFactory @@ -51,12 +52,12 @@ open class NodeTemplateExecutionService { val nodeTemplateImplementation = blueprintContext .nodeTemplateOperationImplementation(nodeTemplateName, interfaceName, operationName) - - val timeout: Int = nodeTemplateImplementation?.timeout ?: 180 + ?: Implementation() log.info( "executing node template($nodeTemplateName) component($componentName) " + - "interface($interfaceName) operation($operationName) with timeout($timeout) sec." + "interface($interfaceName) operation($operationName) on host (${nodeTemplateImplementation.operationHost}) " + + "with timeout(${nodeTemplateImplementation.timeout}) sec." ) // Get the Component Instance @@ -77,7 +78,6 @@ open class NodeTemplateExecutionService { stepInputs[BluePrintConstants.PROPERTY_CURRENT_NODE_TEMPLATE] = nodeTemplateName.asJsonPrimitive() stepInputs[BluePrintConstants.PROPERTY_CURRENT_INTERFACE] = interfaceName.asJsonPrimitive() stepInputs[BluePrintConstants.PROPERTY_CURRENT_OPERATION] = operationName.asJsonPrimitive() - stepInputs[BluePrintConstants.PROPERTY_CURRENT_TIMEOUT] = timeout.asJsonPrimitive() val stepInputData = StepData().apply { name = nodeTemplateName properties = stepInputs -- cgit 1.2.3-korg