diff options
author | 2021-10-18 16:42:46 +0200 | |
---|---|---|
committer | 2021-10-19 09:45:39 +0000 | |
commit | 927d84c4f26a0ca1d4ab68a249207dd4fdbca8f8 (patch) | |
tree | 6e4a73ef37a71ff716ced35ab65a483ae746017f /heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl | |
parent | 129d553d323653461d14f248cb9e8b6f266eb5e3 (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
(cherry picked from commit 734b3d2134b4e1dd3cd946b8badd2baf83f97110)
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl')
-rw-r--r-- | heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl | 51 |
1 files changed, 4 insertions, 47 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl index 4702f15c..491e9f84 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-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": "netbox-ip-assign", "key-mapping": [ { @@ -110,6 +63,10 @@ "param-name": "vnf_name", "param-value": "${vnf_name}" }, + { + "param-name": "vf-module-name", + "param-value": "${vf-module-name}" + }, ##RB name { "param-name": "vf-module-model-invariant-uuid", |