Templating constants added to ResourceAssignment

[ccsdk/cds.git] / ms / blueprintsprocessor / functions / resource-resolution / src / main / kotlin / org / onap / ccsdk / cds / blueprintsprocessor / functions / resource / resolution / capabilities / IpAssignResolutionCapability.kt

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/IpAssignResolutionCapability.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/IpAssignResolutionCapability.kt
index 71cf6ce..9388c28 100644 (file)
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/IpAssignResolutionCapability.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/capabilities/IpAssignResolutionCapability.kt
@@ -68,14 +68,18 @@ open class IpAssignResolutionCapability : ResourceAssignmentProcessor() {
                         as MutableMap<String, String>
 
                 // Get the values from runtime store
-                val resolvedKeyValues = resolveInputKeyMappingVariables(inputKeyMapping)
-                log.info("\nResolved Input Key mappings: \n{}", resolvedKeyValues)
-
-                resolvedKeyValues?.map { KeyIdentifier(it.key, it.value) }
-                    ?.let { resourceAssignment.keyIdentifiers.addAll(it) }
+                val resolvedInputKeyMapping = resolveInputKeyMappingVariables(
+                    inputKeyMapping,
+                    resourceAssignment.templatingConstants
+                ).toMutableMap()
+                log.info("\nResolved Input Key mappings: \n$resolvedInputKeyMapping")
+
+                resolvedInputKeyMapping.map { KeyIdentifier(it.key, it.value) }.let {
+                    resourceAssignment.keyIdentifiers.addAll(it)
+                }
 
                 // Generate the payload using already resolved value
-                val generatedPayload = generatePayload(resolvedKeyValues, groupResourceAssignments)
+                val generatedPayload = generatePayload(resolvedInputKeyMapping, groupResourceAssignments)
                 log.info("\nIP Assign mS Request Payload: \n{}", generatedPayload.asJsonType().toPrettyString())
 
                 resourceSourceProperties["resolved-payload"] = JacksonUtils.jsonNode(generatedPayload)