aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vFW_CNF_CDS/templates/cba/Scripts
diff options
context:
space:
mode:
authorSamuli Silvius <s.silvius@partner.samsung.com>2020-01-09 15:24:56 +0200
committerSamuli Silvius <s.silvius@partner.samsung.com>2020-01-09 21:38:58 +0200
commit08c029aa4bc814599cf75b5db692ae3266b830b3 (patch)
treeeb8a4b075e5ad73c19b4f46497c318c6b91acd8e /heat/vFW_CNF_CDS/templates/cba/Scripts
parent666c1371b11799b88658b5e2ac3f77f1b01d2231 (diff)
Additional missing changed for CNF parameter resolution.
Accidentally missed adding "vf-module-model-invariant-uuid" and "vf-module-model-version" to vf-modules mappings for resolution in previous commit. Issue-ID: INT-1260 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com> Change-Id: I0a47027e73284b4b0ae0a1f0ce18e45d6b2d9142
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba/Scripts')
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt8
1 files changed, 4 insertions, 4 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt
index 81b0c3e5..5231fb5c 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt
+++ b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt
@@ -85,8 +85,8 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() {
val payloadObject = JacksonUtils.jsonNode(payload) as ObjectNode
- val vfModuleModelInvariantUuid: String = getResolvedParameter(payloadObject, "vf_module_model_invariant_uuid")
- val vfModuleModelUuid: String = getResolvedParameter(payloadObject, "vf_module_model_version")
+ val vfModuleModelInvariantUuid: String = getResolvedParameter(payloadObject, "vf-module-model-invariant-uuid")
+ val vfModuleModelUuid: String = getResolvedParameter(payloadObject, "vf-module-model-version")
val k8sRbProfileName: String = getResolvedParameter(payloadObject, "k8s-rb-profile-name")
val k8sRbProfileNamespace: String = getResolvedParameter(payloadObject, "k8s-rb-profile-namespace")
@@ -103,7 +103,7 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() {
if (api.hasProfile(k8sRbProfileName)) {
log.info("Profile Already Existing - skipping upload")
} else {
- profileFilePath = prepareProfileFile(k8sRbProfileName)
+ val profileFilePath = prepareProfileFile(k8sRbProfileName)
var profile = K8sProfile()
profile.profileName = k8sRbProfileName
@@ -323,4 +323,4 @@ class K8sProfile {
override fun hashCode(): Int {
return javaClass.hashCode()
}
-} \ No newline at end of file
+}