diff options
author | Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2022-08-26 00:23:01 +0200 |
---|---|---|
committer | Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2022-09-01 15:50:43 +0200 |
commit | 54fdb67b49134fe357a6415fba761bab2588a197 (patch) | |
tree | f570bea40b27a802f463f449dfbedde67b091a28 /ms/blueprintsprocessor/functions/resource-resolution/src/main | |
parent | 89c17ae2e3222b98450e7c8d17566cd76ecf113b (diff) |
Resolution processors tests and extendability
- Open resolution processors for in-CBA customization
- Improve resolution tests verification
- Use RestProcessor for testing RestProcessor
Issue-ID: CCSDK-3716
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>
Change-Id: I7c05fc940647f40c20c37b4f7fcfe29f2c3076ba
Diffstat (limited to 'ms/blueprintsprocessor/functions/resource-resolution/src/main')
5 files changed, 13 insertions, 13 deletions
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceResolutionProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceResolutionProcessor.kt index 9f318a314..f1692bbdf 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceResolutionProcessor.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/CapabilityResourceResolutionProcessor.kt @@ -91,7 +91,7 @@ open class CapabilityResourceResolutionProcessor(private var componentFunctionSc ResourceAssignmentUtils.setFailedResourceDataValue(resourceAssignment, runtimeException.message) } - suspend fun scriptInstance(scriptType: String, scriptClassReference: String, instanceDependencies: List<String>): + open suspend fun scriptInstance(scriptType: String, scriptClassReference: String, instanceDependencies: List<String>): ResourceAssignmentProcessor { log.info("creating resource resolution of script type($scriptType), reference name($scriptClassReference)") diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt index 785f47772..25d19cff5 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt @@ -78,7 +78,7 @@ open class DatabaseResourceAssignmentProcessor( } } - private fun setValueFromDB(resourceAssignment: ResourceAssignment) { + open fun setValueFromDB(resourceAssignment: ResourceAssignment) { val dName = resourceAssignment.dictionaryName!! val dSource = resourceAssignment.dictionarySource!! val resourceDefinition = resourceDefinition(dName) @@ -119,7 +119,7 @@ open class DatabaseResourceAssignmentProcessor( populateResource(resourceAssignment, sourceProperties, rows) } - private fun blueprintDBLibService(sourceProperties: DatabaseResourceSource, selector: String): BluePrintDBLibGenericService { + open fun blueprintDBLibService(sourceProperties: DatabaseResourceSource, selector: String): BluePrintDBLibGenericService { return if (isNotEmpty(sourceProperties.endpointSelector)) { val dbPropertiesJson = raRuntimeService.resolveDSLExpression(sourceProperties.endpointSelector!!) bluePrintDBLibPropertyService.JdbcTemplate(dbPropertiesJson) @@ -129,7 +129,7 @@ open class DatabaseResourceAssignmentProcessor( } @Throws(BluePrintProcessorException::class) - private fun validate(resourceAssignment: ResourceAssignment) { + open fun validate(resourceAssignment: ResourceAssignment) { checkNotEmpty(resourceAssignment.name) { "resource assignment template key is not defined" } checkNotEmpty(resourceAssignment.dictionaryName) { "resource assignment dictionary name is not defined for template key (${resourceAssignment.name})" @@ -140,12 +140,12 @@ open class DatabaseResourceAssignmentProcessor( } // placeholder to get the list of DB sources. - private fun getListOfDBSources(): Array<String> { + open fun getListOfDBSources(): Array<String> { return ResourceSourceMappingFactory.getRegisterSourceMapping() .resourceSourceMappings.filterValues { it == "source-db" }.keys.toTypedArray() } - private fun populateNamedParameter(inputKeyMapping: Map<String, String>): Map<String, Any> { + open fun populateNamedParameter(inputKeyMapping: Map<String, String>): Map<String, Any> { val namedParameters = HashMap<String, Any>() inputKeyMapping.forEach { val expressionValue = raRuntimeService.getResolutionStore(it.value).textValue() @@ -159,7 +159,7 @@ open class DatabaseResourceAssignmentProcessor( } @Throws(BluePrintProcessorException::class) - private fun populateResource( + open fun populateResource( resourceAssignment: ResourceAssignment, sourceProperties: DatabaseResourceSource, rows: List<Map<String, Any>> diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/InputResourceResolutionProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/InputResourceResolutionProcessor.kt index caf6b6acb..dcf8801fc 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/InputResourceResolutionProcessor.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/InputResourceResolutionProcessor.kt @@ -63,7 +63,7 @@ open class InputResourceResolutionProcessor : ResourceAssignmentProcessor() { } // usecase: where input data attribute doesn't match with resourceName, and needs an alternate mapping provided under key-dependencies. - private fun setFromKeyDependencies(resourceAssignment: ResourceAssignment) { + open fun setFromKeyDependencies(resourceAssignment: ResourceAssignment) { val dName = resourceAssignment.dictionaryName!! val dSource = resourceAssignment.dictionarySource!! val resourceDefinition = resourceDefinition(dName) diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/ResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/ResourceAssignmentProcessor.kt index c075e1b4d..e96083f95 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/ResourceAssignmentProcessor.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/ResourceAssignmentProcessor.kt @@ -124,7 +124,7 @@ abstract class ResourceAssignmentProcessor : BlueprintFunctionNode<ResourceAssig return true } - suspend fun executeScript(resourceAssignment: ResourceAssignment) { + open suspend fun executeScript(resourceAssignment: ResourceAssignment) { return when (scriptType) { BluePrintConstants.SCRIPT_JYTHON -> { executeScriptBlocking(resourceAssignment) @@ -198,7 +198,7 @@ abstract class ResourceAssignmentProcessor : BlueprintFunctionNode<ResourceAssig raRuntimeService.getBluePrintError().addError(error, getName()) } - fun isTemplateKeyValueNull(resourceAssignment: ResourceAssignment): Boolean { + open fun isTemplateKeyValueNull(resourceAssignment: ResourceAssignment): Boolean { val resourceProp = checkNotNull(resourceAssignment.property) { "Failed to populate mandatory resource resource mapping $resourceAssignment" } diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt index de470d26b..479be6923 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt @@ -141,7 +141,7 @@ open class RestResourceResolutionProcessor(private val blueprintRestLibPropertyS } } - fun blueprintWebClientService( + open fun blueprintWebClientService( resourceAssignment: ResourceAssignment, restResourceSource: RestResourceSource ): BlueprintWebClientService { @@ -154,7 +154,7 @@ open class RestResourceResolutionProcessor(private val blueprintRestLibPropertyS } @Throws(BluePrintProcessorException::class) - private fun populateResource( + open fun populateResource( resourceAssignment: ResourceAssignment, sourceProperties: RestResourceSource, restResponse: String, @@ -216,7 +216,7 @@ open class RestResourceResolutionProcessor(private val blueprintRestLibPropertyS } @Throws(BluePrintProcessorException::class) - private fun validate(resourceAssignment: ResourceAssignment) { + open fun validate(resourceAssignment: ResourceAssignment) { checkNotEmpty(resourceAssignment.name) { "resource assignment template key is not defined" } checkNotEmpty(resourceAssignment.dictionaryName) { "resource assignment dictionary name is not defined for template key (${resourceAssignment.name})" |