From 08c029aa4bc814599cf75b5db692ae3266b830b3 Mon Sep 17 00:00:00 2001 From: Samuli Silvius Date: Thu, 9 Jan 2020 15:24:56 +0200 Subject: 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 Change-Id: I0a47027e73284b4b0ae0a1f0ce18e45d6b2d9142 --- .../templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'heat/vFW_CNF_CDS/templates/cba/Scripts') 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 +} -- cgit 1.2.3-korg