Merge "rb-version changed to vf-module-model-customization-uuid"

6 files changed, 10 insertions, 10 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sProfileUpload.kt b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sProfileUpload.kt
index 672c71074..2b8c7b21f 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sProfileUpload.kt
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sProfileUpload.kt
@@ -77,7 +77,7 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() {
             log.info("Uploading K8S profile for template prefix $prefix")
 
             val vfModuleModelInvariantUuid: String = getResolvedParameter(payloadObject, "vf-module-model-invariant-uuid")
-            val vfModuleModelUuid: String = getResolvedParameter(payloadObject, "vf-module-model-version")
+            val vfModuleModelUuid: String = getResolvedParameter(payloadObject, "vf-module-model-customization-uuid")
             val k8sRbProfileName: String = getResolvedParameter(payloadObject, "k8s-rb-profile-name")
             val k8sRbProfileNamespace: String = getResolvedParameter(payloadObject, "k8s-rb-profile-namespace")
             val vnfId: String = getResolvedParameter(payloadObject, "vnf-id")
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sUpdateConfig.kt b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sUpdateConfig.kt
index cd555b49a..d10799656 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sUpdateConfig.kt
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sUpdateConfig.kt
@@ -122,7 +122,7 @@ open class KotlinK8sUpdateConfig : AbstractScriptComponentFunction() {
 
                 log.info("AAI Vf-module Invariant ID is : $vfModuleModelInvariantUuid")
 
-                val vfModuleModelUuid: String = item.get("model-version-id").asText()
+                val vfModuleModelUuid: String = item.get("model-customization-id").asText()
 
                 log.info("AAI Vf-module UUID is : $vfModuleModelUuid")
 
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-template.vtl
index bd487b306..b2abaae51 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-template.vtl
@@ -93,8 +93,8 @@
       "param-value": "${vf-module-model-invariant-uuid}"
     },
     {
-      "param-name": "vf-module-model-version",
-      "param-value": "${vf-module-model-version}"
+      "param-name": "vf-module-model-customization-uuid",
+      "param-value": "${vf-module-model-customization-uuid}"
     },
     {
       "param-name": "vnf-id",
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-template.vtl
index f910f4fdd..fcee84620 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-template.vtl
@@ -67,8 +67,8 @@
       "param-value": "${vf-module-model-invariant-uuid}"
     },
     {
-      "param-name": "vf-module-model-version",
-      "param-value": "${vf-module-model-version}"
+      "param-name": "vf-module-model-customization-uuid",
+      "param-value": "${vf-module-model-customization-uuid}"
     },
     {
       "param-name": "vf-module-id",
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-template.vtl
index 781b3e75f..c858d09f4 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-template.vtl
@@ -93,8 +93,8 @@
       "param-value": "${vf-module-model-invariant-uuid}"
     },
     {
-      "param-name": "vf-module-model-version",
-      "param-value": "${vf-module-model-version}"
+      "param-name": "vf-module-model-customization-uuid",
+      "param-value": "${vf-module-model-customization-uuid}"
     },
     {
       "param-name": "vnf-id",
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-template.vtl
index 290d0edfa..75b172347 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-template.vtl
@@ -93,8 +93,8 @@
       "param-value": "${vf-module-model-invariant-uuid}"
     },
     {
-      "param-name": "vf-module-model-version",
-      "param-value": "${vf-module-model-version}"
+      "param-name": "vf-module-model-customization-uuid",
+      "param-value": "${vf-module-model-customization-uuid}"
     },
     {
       "param-name": "vnf-id",