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)

2 files changed, 4 insertions, 2 deletions

diff --git a/heat/vFW_CNF_CDS/automation/config.py b/heat/vFW_CNF_CDS/automation/config.py
index 5732d4b4..82536960 100755
--- a/heat/vFW_CNF_CDS/automation/config.py
+++ b/heat/vFW_CNF_CDS/automation/config.py
@@ -115,6 +115,8 @@ class Config:
         VF_MODULE_PARAM_LIST[VF_MODULE_PREFIX + "vpkg"]["k8s-rb-profile-name"] = PROFILE_NAME
         VF_MODULE_PARAM_LIST[VF_MODULE_PREFIX + "vpkg"]["k8s-rb-profile-source"] = PROFILE_SOURCE
         VF_MODULE_PARAM_LIST[VF_MODULE_PREFIX + "vpkg"]["k8s-rb-config-template-name"] = "ssh-service-config"
+        VF_MODULE_PARAM_LIST[VF_MODULE_PREFIX + "vpkg"]["k8s-rb-config-template-source"] = "ssh-service-config"
         VF_MODULE_PARAM_LIST[VF_MODULE_PREFIX + "vpkg"]["k8s-rb-config-name"] = "ssh-service-config"
+        VF_MODULE_PARAM_LIST[VF_MODULE_PREFIX + "vpkg"]["k8s-rb-config-value-source"] = "ssh-service-config"
     else:
         raise Exception("Not Implemented Scenario")
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()
             }
         }