diff options
author | 2020-03-06 09:24:23 +0100 | |
---|---|---|
committer | 2020-03-13 14:07:49 +0100 | |
commit | a1ffe0ce52a4efa1ed56474417aa525d60518a5b (patch) | |
tree | 6e9cc4feb917a93d8a228d154a6cdf38068b91b0 /heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl | |
parent | 523796ad09130868e8e31e942cd4d9712eb75934 (diff) |
Simplify CBA by removing unnecessary variables
Change scope:
- demo_artifacts_version - default on vnf level, removed vf-module level
- install_script_version - removed
- *image_name - removed
- public_net_id - removed
- key_name - removed
- pub_key - removed
- *flavor_name - removed
- sec_group - removed
- nfc-naming-code - removed
- cloud_env - removed
- nexus_artifact_repo - removed
- *cidr - removed, where applicable
- *ip - removed, where applicable
- dcae* - moved to vnf level
- aic-cloud-region - removed on vf-module level
- vnf_name - removed on base-template level
- vf-module-type - removed
- vnfc-model-version - removed
- vnfc-model-invariant-uuid - removed
- vfccustomizationuuid - removed
- vf-module-id - removed from template result
- service-instance-id - removed from template result
- vnf_name - removed and vf-module level
- vf-module-model-customization-uuid - removed from template result
- vf-module-model-version - removed from template result
- vf-module-model-invariant-uuid - removed from template result
- vnf-model-customization-uuid - removed at vf-module-level
and few other minor tweaks including updating dataDict and enrichment
Issue-ID: INT-1260
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Ica6073d0270da9d5ff0f0e544a9b329f66d9b5bb
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl')
-rw-r--r-- | heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl | 126 |
1 files changed, 74 insertions, 52 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl index 76eda6d3..888b8421 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl @@ -1,71 +1,105 @@ { "capability-data": [ { - "capability-name": "aai-vf-module-put", + "capability-name": "netbox-ip-assign", "key-mapping": [ { "output-key-mapping": [ { - "resource-name": "aai-vf-module-put", - "resource-value": "${status}" + "resource-name": "onap_private_gw_ip", + "resource-value": "${onap_private_gw_ip}" } ], "payload": [ { - "param-name": "vf-module", - "param-value": "vf-module" + "param-name": "service-instance-id", + "param-value": "${service-instance-id}" + }, + { + "param-name": "prefix-id", + "param-value": "${management-prefix-id}" + }, + { + "param-name": "vnf-id", + "param-value": "${vnf-id}" + }, + { + "param-name": "external_key", + "param-value": "${vnf-id}-onap_private_gw_ip" } ] } ] - } - ], - "resource-accumulator-resolved-data": [ - { - "param-name": "service-instance-id", - "param-value": "${service-instance-id}" }, { - "param-name": "vnf_name", - "param-value": "${vnf_name}" + "capability-name": "generate-name", + "key-mapping": [ + { + "output-key-mapping": [ + { + "resource-name": "vf_module_name", + "resource-value": "${vf-module-name}" + } + ], + "payload": [ + { + "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}" + } + ] + } + ] }, { - "param-name": "vnf_model_customization_uuid", - "param-value": "${vnf-model-customization-uuid}" - }, + "capability-name": "aai-vf-module-put", + "key-mapping": [ + { + "output-key-mapping": [ + { + "resource-name": "aai-vf-module-put", + "resource-value": "" + } + ] + } + ] + } + ], + "resource-accumulator-resolved-data": [ +##RB name { "param-name": "vf-module-model-invariant-uuid", "param-value": "${vf-module-model-invariant-uuid}" }, +##RB version { "param-name": "vf-module-model-version", "param-value": "${vf-module-model-version}" }, { - "param-name": "vf_module_id", - "param-value": "${vf-module-id}" - }, - { - "param-name": "vf_module_type", - "param-value": "${vf-module-type}" - }, - { - "param-name": "int_private1_net_cidr", - "param-value": "${int_private1_net_cidr}" - }, - { - "param-name": "int_private2_net_cidr", - "param-value": "${int_private2_net_cidr}" - }, - { - "param-name": "onap_private_net_cidr", - "param-value": "${onap_private_net_cidr}" - }, - { - "param-name": "pub_key", - "param-value": "${pub_key}" - }, - { "param-name": "k8s-rb-profile-name", "param-value": "${k8s-rb-profile-name}" }, @@ -74,26 +108,14 @@ "param-value": "${k8s-rb-profile-namespace}" }, { - "param-name": "int_private1_gw_ip", - "param-value": "${int_private1_gw_ip}" - }, - { "param-name": "int_private1_subnet_id", "param-value": "unprotected-network-subnet-1" }, { - "param-name": "int_private2_gw_ip", - "param-value": "${int_private2_gw_ip}" - }, - { "param-name": "int_private2_subnet_id", "param-value": "protected-network-subnet-1" }, { - "param-name": "onap_private_gw_ip", - "param-value": "${onap_private_gw_ip}" - }, - { "param-name": "onap_private_subnet_id", "param-value": "management-network-subnet-1" } |