X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FTemplates%2Fvnf-template.vtl;h=3e235e266c094dbd70b5554387669051fe951453;hp=e050c97702e53eb2584d839ab9b032e68418c063;hb=3c887a297e506f393df2a56e748fc398bcbc4b1a;hpb=7d44d14b86dd4858afadb55c9ca38a4251e13dac 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 e050c977..3e235e26 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl @@ -277,6 +277,31 @@ ] } ] + }, + { + "capability-name": "unresolved-composite-data", + "key-mapping": [ + { + "output-key-mapping": [ + { + "resource-name": "int_private2_net_id", + "resource-value": "${vnf_name}-protected-network" + }, + { + "resource-name": "int_private1_net_id", + "resource-value": "${vnf_name}-unprotected-network" + }, + { + "resource-name": "onap_private_net_id", + "resource-value": "${vnf_name}-management-network" + }, + { + "resource-name": "net_attachment_definition", + "resource-value": "${vnf_name}-ovn-nat" + } + ] + } + ] } ], "resource-accumulator-resolved-data": [ @@ -328,10 +353,6 @@ "param-name": "install_script_version", "param-value": "${install_script_version}" }, - { - "param-name": "net_attachment_definition", - "param-value": "${vnf-id}-ovn-nat" - }, { "param-name": "pub_key", "param-value": "${pub_key}"