diff options
11 files changed, 95 insertions, 138 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba-dd.json b/heat/vFW_CNF_CDS/templates/cba-dd.json index 4da510f4..12644d4c 100644 --- a/heat/vFW_CNF_CDS/templates/cba-dd.json +++ b/heat/vFW_CNF_CDS/templates/cba-dd.json @@ -780,6 +780,32 @@ } }, { + "name": "vpg-management-port", + "tags": "vpg-management-port", + "data_type": "string", + "description": "vpg-management-port", + "entry_schema": "string", + "updatedBy": "Rajewski, Lukasz <lukasz.rajewski@orange.com>", + "definition": { + "tags": "vpg-management-port", + "name": "vpg-management-port", + "property": { + "description": "vpg-management-port", + "type": "string" + }, + "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + } + }, + { "name": "key_name", "tags": "key_name", "data_type": "string", diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json index 673c0864..5f7fa0e2 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json @@ -5,7 +5,7 @@ "author-email" : "abdelmuhaimen.seaudi@orange.com", "user-groups" : "ADMIN, OPERATION", "template_name" : "vFW_CNF_CDS", - "template_version" : "1.0.13", + "template_version" : "1.0.25", "template_tags" : "Samuli Silvius, vFW_CNF_CDS", "template_type" : "DEFAULT" }, diff --git a/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta b/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta index 9a58a238..9a32b5ca 100644 --- a/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta +++ b/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta @@ -1,9 +1,8 @@ -# FIXME vim :set makeprg=make -j1 clean all TOSCA-Meta-File-Version: 1.0.0 CSAR-Version: 1.0 Created-By: Samuli Silvius <s.silvius@partner.samsung.com> Entry-Definitions: Definitions/vFW_CNF_CDS.json Template-Name: vFW_CNF_CDS -Template-Version: 1.0.13 +Template-Version: 1.0.25 Template-Type: DEFAULT Template-Tags: Samuli Silvius, vFW_CNF_CDS 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 990e7200..76eda6d3 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 @@ -78,36 +78,24 @@ "param-value": "${int_private1_gw_ip}" }, { - "param-name": "int_private1_net_id", - "param-value": "${vnf-id}-unprotected-network" - }, - { "param-name": "int_private1_subnet_id", - "param-value": "${vnf-id}-unprotected-network-subnet-1" + "param-value": "unprotected-network-subnet-1" }, { "param-name": "int_private2_gw_ip", "param-value": "${int_private2_gw_ip}" }, { - "param-name": "int_private2_net_id", - "param-value": "${vnf-id}-protected-network" - }, - { "param-name": "int_private2_subnet_id", - "param-value": "${vnf-id}-protected-network-subnet-1" + "param-value": "protected-network-subnet-1" }, { "param-name": "onap_private_gw_ip", "param-value": "${onap_private_gw_ip}" }, { - "param-name": "onap_private_net_id", - "param-value": "${vnf-id}-management-network" - }, - { "param-name": "onap_private_subnet_id", - "param-value": "${vnf-id}-namagement-network-subnet-1" + "param-value": "management-network-subnet-1" } ] } diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json index 320c1ac4..508c7339 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json @@ -441,28 +441,6 @@ "dependencies": [], "version": 0 }, - - { - "name": "vfw_name_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - {} - ], - "entry_schema": { - "type": "" - }, - "default": "${vfw_name_0}" - }, - "input-param": false, - "dictionary-name": "vfw_name_0", - "dictionary-source": "default", - "dependencies": [], - "version": 0 - }, { "name": "vfw_onap_private_ip_0", "property": { 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 820df768..414d6865 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl @@ -38,10 +38,6 @@ { "param-name": "VF_MODULE_LABEL", "param-value": "${vf-module-label}" - }, - { - "param-name": "VF_MODULE_TYPE", - "param-value": "${vf-module-type}" } ] } @@ -96,6 +92,19 @@ ] } ] + }, + { + "capability-name": "unresolved-composite-data", + "key-mapping": [ + { + "output-key-mapping": [ + { + "resource-name": "vfw_name_0", + "resource-value": "${vf_module_name}" + } + ] + } + ] } ], "resource-accumulator-resolved-data": [ @@ -238,22 +247,6 @@ { "param-name": "k8s-rb-profile-namespace", "param-value": "${k8s-rb-profile-namespace}" - }, - { - "param-name": "onap_private_net_id", - "param-value": "${vnf-id}-management-network" - }, - { - "param-name": "int_private2_net_id", - "param-value": "${vnf-id}-protected-network" - }, - { - "param-name": "int_private1_net_id", - "param-value": "${vnf-id}-unprotected-network" - }, - { - "param-name": "vfw_name_0", - "param-value": "vfw-${vf-module-id}" } ] } 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": [ @@ -329,10 +354,6 @@ "param-value": "${install_script_version}" }, { - "param-name": "net_attachment_definition", - "param-value": "${vnf-id}-ovn-nat" - }, - { "param-name": "pub_key", "param-value": "${pub_key}" }, diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json index 68ae6b06..2e3905cc 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json @@ -440,27 +440,6 @@ "version": 0 }, { - "name": "vpg_name_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - {} - ], - "entry_schema": { - "type": "" - }, - "default": "${vpg_name_0}" - }, - "input-param": false, - "dictionary-name": "vpg_name_0", - "dictionary-source": "default", - "dependencies": [], - "version": 0 - }, - { "name": "private2-prefix-id", "property": { "description": "", diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl index 3b0453d1..55ad7906 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl @@ -38,10 +38,6 @@ { "param-name": "VF_MODULE_LABEL", "param-value": "${vf-module-label}" - }, - { - "param-name": "VF_MODULE_TYPE", - "param-value": "${vf-module-type}" } ] } @@ -65,6 +61,19 @@ ] } ] + }, + { + "capability-name": "unresolved-composite-data", + "key-mapping": [ + { + "output-key-mapping": [ + { + "resource-name": "vpg_name_0", + "resource-value": "${vf_module_name}" + } + ] + } + ] } ], "resource-accumulator-resolved-data": [ @@ -203,18 +212,6 @@ { "param-name": "k8s-rb-profile-namespace", "param-value": "${k8s-rb-profile-namespace}" - }, - { - "param-name": "onap_private_net_id", - "param-value": "${vnf-id}-management-network" - }, - { - "param-name": "int_private1_net_id", - "param-value": "${vnf-id}-unprotected-network" - }, - { - "param-name": "vpg_name_0", - "param-value": "vpg-${vf-module-id}" } ] } diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json index 7b85b54e..5803ea65 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json @@ -469,27 +469,6 @@ "version": 0 }, { - "name": "vsn_name_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - {} - ], - "entry_schema": { - "type": "" - }, - "default": "${vsn_name_0}" - }, - "input-param": false, - "dictionary-name": "vsn_name_0", - "dictionary-source": "default", - "dependencies": [], - "version": 0 - }, - { "name": "vnf-id", "property": { "description": "", diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl index a7a61d6b..f71379c2 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl @@ -38,10 +38,6 @@ { "param-name": "VF_MODULE_LABEL", "param-value": "${vf-module-label}" - }, - { - "param-name": "VF_MODULE_TYPE", - "param-value": "${vf-module-type}" } ] } @@ -96,6 +92,19 @@ ] } ] + }, + { + "capability-name": "unresolved-composite-data", + "key-mapping": [ + { + "output-key-mapping": [ + { + "resource-name": "vsn_name_0", + "resource-value": "${vf_module_name}" + } + ] + } + ] } ], "resource-accumulator-resolved-data": [ @@ -172,10 +181,6 @@ "param-value": "${int_private2_net_cidr}" }, { - "param-name": "onap_private_net_id", - "param-value": "${vnf-id}-management-network" - }, - { "param-name": "onap_private_net_cidr", "param-value": "${onap_private_net_cidr}" }, @@ -222,14 +227,6 @@ { "param-name": "int_private2_gw_ip", "param-value": "${int_private2_gw_ip}" - }, - { - "param-name": "int_private2_net_id", - "param-value": "${vnf-id}-protected-network" - }, - { - "param-name": "vsn_name_0", - "param-value": "vsn-${vf-module-id}" } ] } |