diff options
author | Michal Chabiera <michal.chabiera@orange.com> | 2021-10-18 16:42:46 +0200 |
---|---|---|
committer | Michal Chabiera <michal.chabiera@orange.com> | 2021-10-19 09:51:01 +0200 |
commit | 734b3d2134b4e1dd3cd946b8badd2baf83f97110 (patch) | |
tree | a7b42f00a21f1d42e5c04b54be528816524a445d /heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl | |
parent | d2e7ad9353fcd3fde078a1f2dea85dbe26871626 (diff) |
[vFW CNF CDS] vf_module and vnf name generation improvment in CBA
During service deletion generation of vf_module and vnf name causes SDNC error.
Issue-ID: INT-1960
Signed-off-by: Michal Chabiera <michal.chabiera@orange.com>
Change-Id: I88f92e32982dca2054dde7055f40785159d8ec39
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl')
-rw-r--r-- | heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl | 43 |
1 files changed, 4 insertions, 39 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl index 9f6e96ae..5a963205 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/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-name": "netbox-ip-assign", "key-mapping": [ { @@ -228,6 +189,10 @@ ], "resource-accumulator-resolved-data": [ { + "param-name": "vnf_name", + "param-value": "${vnf_name}" + }, + { "param-name": "vf-naming-policy", "param-value": "${vf-naming-policy}" }, |