From fcf124f6fafbf8b0ce9a075ffb91ccc54ef3a0c0 Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Thu, 22 Apr 2021 19:01:23 +0200 Subject: vFW CNF fix for issue with config-deploy operation Issue-ID: INT-1868 Signed-off-by: Lukasz Rajewski Change-Id: Ia905c89b96f568bc362c0fd6f73bf0ec4c06212c --- heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'heat/vFW_CNF_CDS/templates/cba') 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 f04813df..668dcdcf 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt +++ b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt @@ -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() } } -- cgit 1.2.3-korg