diff options
| author |   Lukasz Rajewski <lukasz.rajewski@orange.com> | 2021-04-22 19:01:23 +0200 |
|---|---|---|
| committer | Lukasz Rajewski <lukasz.rajewski@orange.com> | 2021-04-22 17:24:20 +0000 |
| commit | 660f9f9e9f4450f12e948b9601fa185af53a9006 (patch) | |
| tree | 7e02cb9cea1181a32ff8640bc343ec05bb59dbca /heat/vFW_CNF_CDS/templates/cba/Scripts | |
| parent | bc4fb1fd1e0b761001aef0ac1fb30ac9c57a55af (diff) | |
vFW CNF fix for issue with config-deploy operation
Issue-ID: INT-1868
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: Ia905c89b96f568bc362c0fd6f73bf0ec4c06212c
(cherry picked from commit fcf124f6fafbf8b0ce9a075ffb91ccc54ef3a0c0)
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba/Scripts')
| -rw-r--r-- | heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt | 4 |
1 files changed, 2 insertions, 2 deletions
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() } } |