From a7ba8d739afc31ff1f1427bdabe935c0abc2e3ac Mon Sep 17 00:00:00 2001 From: Sangeeta Bellara Date: Wed, 26 Oct 2022 22:42:46 +0530 Subject: Updated for Jakarta Release Change to native helm, and removed generate-name capability reference. Issue-ID: SO-3835 Change-Id: I59f4271872db1e94c189a3b375da1fe30d1089a3 Signed-off-by: sangeeta.bellara --- .../Templates/helm_amf-template.vtl | 51 +------------------ .../Templates/helm_smf-template.vtl | 52 ++------------------ .../Templates/helm_upf-template.vtl | 57 ++-------------------- .../Templates/vnf-template.vtl | 45 ++--------------- 4 files changed, 13 insertions(+), 192 deletions(-) (limited to 'components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates') diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-template.vtl index 6cc18ff1a..5e1619fa9 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-template.vtl @@ -1,52 +1,5 @@ { "capability-data": [ - { - "capability-name": "generate-name", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "vf_module_name", - "resource-value": "${vf-module-name}" - } - ], - "payload": [ - { - "param-name": "VF_MODULE_TYPE", - "param-value": "vfmt" - }, - { - "param-name": "resource-name", - "param-value": "vf_module_name" - }, - { - "param-name": "resource-value", - "param-value": "${vf-module-name}" - }, - { - "param-name": "external-key", - "param-value": "${vf-module-id}_vf-module-name" - }, - { - "param-name": "policy-instance-name", - "param-value": "${vf-naming-policy}" - }, - { - "param-name": "naming-type", - "param-value": "VF-MODULE" - }, - { - "param-name": "VNF_NAME", - "param-value": "${vnf_name}" - }, - { - "param-name": "VF_MODULE_LABEL", - "param-value": "${vf-module-label}" - } - ] - } - ] - }, { "capability-name": "aai-vf-module-put", "key-mapping": [ @@ -132,7 +85,7 @@ "param-name": "config.supportedNssai.sNssai.snssai", "param-value": "${fivegc0_snssai}" } - - + + ] } diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-template.vtl index ba834e8e5..0aa21bb06 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-template.vtl @@ -1,52 +1,6 @@ { "capability-data": [ - { - "capability-name": "generate-name", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "vf_module_name", - "resource-value": "${vf-module-name}" - } - ], - "payload": [ - { - "param-name": "VF_MODULE_TYPE", - "param-value": "vfmt" - }, - { - "param-name": "resource-name", - "param-value": "vf_module_name" - }, - { - "param-name": "resource-value", - "param-value": "${vf-module-name}" - }, - { - "param-name": "external-key", - "param-value": "${vf-module-id}_vf-module-name" - }, - { - "param-name": "policy-instance-name", - "param-value": "${vf-naming-policy}" - }, - { - "param-name": "naming-type", - "param-value": "VF-MODULE" - }, - { - "param-name": "VNF_NAME", - "param-value": "${vnf_name}" - }, - { - "param-name": "VF_MODULE_LABEL", - "param-value": "${vf-module-label}" - } - ] - } - ] - }, + { "capability-name": "aai-vf-module-put", "key-mapping": [ @@ -108,7 +62,7 @@ "param-name": "vf-module-label", "param-value": "${vf-module-label}" }, - + { "param-name": "k8s-rb-profile-name", "param-value": "profile-${vf-module-id}" @@ -125,7 +79,7 @@ "param-name": "k8s-rb-profile-namespace", "param-value": "ns-${vf-module-id}" }, - + { "param-name": "fivegc0_snssai", "param-value": "${fivegc0_snssai}" diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-template.vtl index a62807ac9..e44ad42eb 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-template.vtl @@ -1,53 +1,6 @@ { "capability-data": [ - { - "capability-name": "generate-name", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "vf_module_name", - "resource-value": "${vf-module-name}" - } - ], - "payload": [ - { - "param-name": "VF_MODULE_TYPE", - "param-value": "vfmt" - }, - { - "param-name": "resource-name", - "param-value": "vf_module_name" - }, - { - "param-name": "resource-value", - "param-value": "${vf-module-name}" - }, - - { - "param-name": "external-key", - "param-value": "${vf-module-id}_vf-module-name" - }, - { - "param-name": "policy-instance-name", - "param-value": "${vf-naming-policy}" - }, - { - "param-name": "naming-type", - "param-value": "VF-MODULE" - }, - { - "param-name": "VNF_NAME", - "param-value": "${vnf_name}" - }, - { - "param-name": "VF_MODULE_LABEL", - "param-value": "${vf-module-label}" - } - ] - } - ] - }, + { "capability-name": "aai-vf-module-put", "key-mapping": [ @@ -105,8 +58,8 @@ "param-name": "vf-module-label", "param-value": "${vf-module-label}" }, - - + + { "param-name": "vf-module-id", "param-value": "${vf-module-id}" @@ -123,7 +76,7 @@ "param-name": "k8s-rb-instance-release-name", "param-value": "release-${vf-module-id}" }, - + { "param-name": "vf-module-model-customization-uuid", "param-value": "${vf-module-model-customization-uuid}" @@ -136,6 +89,6 @@ "param-name": "config.supportedNssai.sNssai.snssai", "param-value": "${fivegc0_snssai}" } - + ] } diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-template.vtl index be5b6c0f0..eeb740193 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-template.vtl @@ -1,45 +1,6 @@ { - "capability-data": [ - { - "capability-name": "generate-name", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "vnf_name", - "resource-value": "${vnf_name}" - } - ], - "payload": [ - { - "param-name": "resource-name", - "param-value": "vnf_name" - }, - { - "param-name": "resource-value", - "param-value": "${vnf_name}" - }, - { - "param-name": "external-key", - "param-value": "${vnf-id}_vnf_name" - }, - { - "param-name": "policy-instance-name", - "param-value": "${vf-naming-policy}" - }, - { - "param-name": "naming-type", - "param-value": "VNF" - }, - { - "param-name": "AIC_CLOUD_REGION", - "param-value": "${aic-cloud-region}" - } - ] - } - ] - } - ], + "capability-data": [], + "resource-accumulator-resolved-data": [ { "param-name": "vnf-id", @@ -49,7 +10,7 @@ "param-name": "vf-naming-policy", "param-value": "${vf-naming-policy}" }, - + { "param-name": "fivegc0_snssai", "param-value": "${fivegc0_snssai}" -- cgit 1.2.3-korg