vFW CNF CDS usecase automation scripts update

[demo.git] / heat / vFW_CNF_CDS / templates / cba / Scripts / kotlin / ConfigDeploySetup.kt

diff --git a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt
index f04813d..78254a8 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt
+++ b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt
@@ -54,7 +54,7 @@ open class ConfigDeploySetup() : ResourceAssignmentProcessor() {
                         val moduleData: ObjectNode = objectMapper.createObjectNode()
                         result.put(label, moduleData)
                         moduleData.put(K8sConfigTemplateComponent.INPUT_K8S_DEFINITION_NAME, modelInfo["model-invariant-uuid"].asText())
-                        moduleData.put(K8sConfigTemplateComponent.INPUT_K8S_DEFINITION_VERSION, modelInfo["model-uuid"].asText())
+                        moduleData.put(K8sConfigTemplateComponent.INPUT_K8S_DEFINITION_VERSION, modelInfo["model-customization-uuid"].asText())
                         val templateName: String? = getParamValueByName(moduleParameters, K8sConfigTemplateComponent.INPUT_K8S_TEMPLATE_NAME)
                         val templateSource: String? = getParamValueByName(moduleParameters, K8sConfigTemplateComponent.INPUT_K8S_TEMPLATE_SOURCE)
                         val configValueSource: String? = getParamValueByName(moduleParameters, K8sConfigValueComponent.INPUT_K8S_CONFIG_VALUE_SOURCE)
@@ -70,7 +70,7 @@ open class ConfigDeploySetup() : ResourceAssignmentProcessor() {
                             moduleData.put(K8sConfigValueComponent.INPUT_K8S_RB_CONFIG_NAME, configName)
 
                         for (aaiModule in modulesAai) {
-                            if (aaiModule["vf-module-id"].asText() == module["vf-module-id"].asText()) {
+                            if (aaiModule["vf-module-id"].asText() == module["vf-module-id"].asText() && aaiModule["heat-stack-id"] != null) {
                                 moduleData.put(K8sConfigValueComponent.INPUT_K8S_INSTANCE_ID, aaiModule["heat-stack-id"].asText())
                                 break
                             }
@@ -90,7 +90,7 @@ open class ConfigDeploySetup() : ResourceAssignmentProcessor() {
 
     private fun getParamValueByName(params: JsonNode, paramName: String): String? {
         for (param in params) {
-            if (param["name"].asText() == paramName) {
+            if (param["name"].asText() == paramName && param["value"].asText() != "null") {
                 return param["value"].asText()
             }
         }