diff options
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba/Templates')
10 files changed, 634 insertions, 163 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json index 7ce97079..b4cadd3f 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json @@ -298,7 +298,145 @@ "vnf-id" ], "version": 0 + }, + { + "name": "k8s-rb-profile-name", + "property": { + "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.", + "type": "string" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-name", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private1_gw_ip", + "property": { + "description": "Private unprotected network gateway ip", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private1_gw_ip", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private1_net_id", + "property": { + "description": "Private unprotected network identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private1_net_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private1_subnet_id", + "property": { + "description": "Private unprotected subnetwork identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private1_subnet_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private2_gw_ip", + "property": { + "description": "Private protected network gateway ip", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private2_gw_ip", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private2_net_id", + "property": { + "description": "Private protected network identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private2_net_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private2_subnet_id", + "property": { + "description": "Private protected subnetwork identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private2_subnet_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "onap_private_gw_ip", + "property": { + "description": "Private onap management network gateway ip", + "type": "string" + }, + "input-param": false, + "dictionary-name": "onap_private_gw_ip", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "onap_private_net_id", + "property": { + "description": "Private onap management network identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "onap_private_net_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "onap_private_subnet_id", + "property": { + "description": "Private onap management subnetwork identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "onap_private_subnet_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] } - - -]
\ No newline at end of file +] 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 c2e92ade..226f4a52 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 @@ -4,10 +4,7 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", "param-value": "${vnf_name}" @@ -24,22 +21,61 @@ "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": "pub_key", - "param-value": "${pub_key}" + { + "param-name": "pub_key", + "param-value": "${pub_key}" + }, + { + "param-name": "k8s-rb-profile-name", + "param-value": "${k8s-rb-profile-name}" + }, + { + "param-name": "int_private1_gw_ip", + "param-value": "${int_private1_gw_ip}" + }, + { + "param-name": "int_private1_net_id", + "param-value": "${int_private1_net_id}" + }, + { + "param-name": "int_private1_subnet_id", + "param-value": "${int_private1_subnet_id}" + }, + { + "param-name": "int_private2_gw_ip", + "param-value": "${int_private2_gw_ip}" + }, + { + "param-name": "int_private2_net_id", + "param-value": "${int_private2_net_id}" + }, + { + "param-name": "int_private2_subnet_id", + "param-value": "${int_private2_subnet_id}" + }, + { + "param-name": "onap_private_gw_ip", + "param-value": "${onap_private_gw_ip}" + }, + { + "param-name": "onap_private_net_id", + "param-value": "${onap_private_net_id}" + }, + { + "param-name": "onap_private_subnet_id", + "param-value": "${onap_private_subnet_id}" } - ], "capability-data": [ { @@ -109,4 +145,4 @@ ] } ] -}
\ No newline at end of file +} 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 86a5cc85..c78d34c9 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json @@ -68,9 +68,9 @@ ], "version": 0 }, - - - + + + { "name": "vfw_int_private2_floating_ip", "property": { @@ -117,7 +117,7 @@ ], "version": 0 }, - + { "name": "vfw_int_private2_ip_0", "property": { @@ -141,11 +141,11 @@ ], "version": 0 }, - - - - - + + + + + { "name": "private1-prefix-id", "property": { @@ -159,7 +159,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "private1-prefix-id", @@ -180,7 +180,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "management-prefix-id", @@ -245,7 +245,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "install_script_version", @@ -269,7 +269,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "demo_artifacts_version", @@ -281,8 +281,8 @@ "version": 0 }, - - + + { "name": "nfc-naming-code", "property": { @@ -487,7 +487,7 @@ "dependencies": [], "version": 0 }, - + { "name": "vfw_name_0", "property": { @@ -530,7 +530,7 @@ "dependencies": [], "version": 0 }, - + { "name": "vf-module-id", "property": { @@ -638,7 +638,7 @@ ], "version": 0 }, - + { "name": "vfccustomizationuuid", "property": { @@ -661,7 +661,7 @@ ], "version": 0 }, - + { "name": "vnf-id", "property": { @@ -814,5 +814,95 @@ "vfccustomizationuuid" ], "version": 0 + }, + { + "name": "dcae_collector_ip", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "10.0.4.1" + }, + "input-param": false, + "dictionary-name": "dcae_collector_ip", + "dictionary-source": "default", + "dependencies": [ + "service-instance-id", + "vnf-id" + ], + "version": 0 + }, + { + "name": "dcae_collector_port", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "30235" + }, + "input-param": false, + "dictionary-name": "dcae_collector_port", + "dictionary-source": "default", + "dependencies": [ + "service-instance-id", + "vnf-id" + ], + "version": 0 + }, + { + "name": "k8s-rb-profile-name", + "property": { + "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.", + "type": "string" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-name", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private1_net_id", + "property": { + "description": "Private unprotected network identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private1_net_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private2_net_id", + "property": { + "description": "Private protected network identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private2_net_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] } -]
\ No newline at end of file +] 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 58996748..d81d961d 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl @@ -4,10 +4,7 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", "param-value": "${vnf_name}" @@ -135,8 +132,19 @@ { "param-name": "nexus_artifact_repo", "param-value": "${nexus_artifact_repo}" - } - + }, + { + "param-name": "k8s-rb-profile-name", + "param-value": "${k8s-rb-profile-name}" + }, + { + "param-name": "int_private1_net_id", + "param-value": "${int_private1_net_id}" + }, + { + "param-name": "int_private2_net_id", + "param-value": "${int_private2_net_id}" + } ], "capability-data": [ { @@ -275,4 +283,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json index f2cb9193..1a1ca278 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json @@ -32,7 +32,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "management-prefix-id", @@ -124,7 +124,7 @@ ], "version": 0 }, - + { "name": "int_private1_net_cidr", "property": { @@ -165,8 +165,8 @@ "dependencies": [], "version": 0 }, - - + + { "name": "int_private2_net_cidr", "property": { @@ -187,8 +187,8 @@ "dependencies": [], "version": 0 }, - - + + { "name": "demo_artifacts_version", "property": { @@ -282,7 +282,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "public_net_id", @@ -323,7 +323,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "vnf-id", @@ -344,7 +344,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "vnf-model-customization-uuid", @@ -394,7 +394,7 @@ "dependencies": [], "version": 0 }, - { + { "name": "vpg_int_private1_ip_0", "property": { "description": "", @@ -428,7 +428,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "aic-cloud-region", @@ -449,7 +449,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "onap_private_net_id", @@ -470,7 +470,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "onap_private_subnet_id", @@ -521,27 +521,6 @@ "version": 0 }, { - "name": "vfw_onap_private_ip_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - {} - ], - "entry_schema": { - "type": "" - }, - "default": "${vfw_onap_private_ip_0}" - }, - "input-param": false, - "dictionary-name": "vfw_onap_private_ip_0", - "dictionary-source": "default", - "dependencies": [], - "version": 0 - }, - { "name": "vsn_int_private2_ip_0", "property": { "description": "", @@ -575,7 +554,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "service-instance-id", @@ -583,7 +562,7 @@ "dependencies": [], "version": 0 }, - + { "name": "private1-prefix-id", "property": { @@ -597,7 +576,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "private1-prefix-id", @@ -618,12 +597,116 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "private2-prefix-id", "dictionary-source": "processor-db", "dependencies": [], "version": 0 + }, + { + "name": "k8s-rb-profile-name", + "property": { + "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.", + "type": "string", + "default": "vfw-cnf-cds-base-profile" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-name", + "dictionary-source": "default", + "dependencies": [ + ] + }, + { + "name": "int_private1_gw_ip", + "property": { + "description": "Private unprotected network gateway ip", + "type": "string", + "default": "192.168.10.1/24" + }, + "input-param": false, + "dictionary-name": "int_private1_gw_ip", + "dictionary-source": "default", + "dependencies": [ + ] + }, + { + "name": "int_private1_net_id", + "property": { + "description": "Private unprotected network identification", + "type": "string", + "default": "${int_private1_net_id}" + }, + "input-param": false, + "dictionary-name": "int_private1_net_id", + "dictionary-source": "default", + "dependencies": [ + ] + }, + { + "name": "int_private1_subnet_id", + "property": { + "description": "Private unprotected subnetwork identification", + "type": "string", + "default": "${int_private1_subnet_id}" + }, + "input-param": false, + "dictionary-name": "int_private1_subnet_id", + "dictionary-source": "default", + "dependencies": [ + ] + }, + { + "name": "int_private2_gw_ip", + "property": { + "description": "Private protected network gateway ip", + "type": "string", + "default": "192.168.20.1/24" + }, + "input-param": false, + "dictionary-name": "int_private2_gw_ip", + "dictionary-source": "default", + "dependencies": [ + ] + }, + { + "name": "int_private2_net_id", + "property": { + "description": "Private protected network identification", + "type": "string", + "default": "${int_private2_net_id}" + }, + "input-param": false, + "dictionary-name": "int_private2_net_id", + "dictionary-source": "default", + "dependencies": [ + ] + }, + { + "name": "int_private2_subnet_id", + "property": { + "description": "Private protected subnetwork identification", + "type": "string", + "default": "${int_private2_subnet_id}" + }, + "input-param": false, + "dictionary-name": "int_private2_subnet_id", + "dictionary-source": "default", + "dependencies": [ + ] + }, + { + "name": "onap_private_gw_ip", + "property": { + "description": "Private onap management network gateway ip", + "type": "string", + "default": "10.10.0.1/16" + }, + "input-param": false, + "dictionary-name": "onap_private_gw_ip", + "dictionary-source": "default", + "dependencies": [ + ] } -]
\ No newline at end of file +] 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 60aeb049..37b4b941 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl @@ -4,10 +4,7 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf-model-customization-uuid", "param-value": "${vnf-model-customization-uuid}" @@ -76,6 +73,38 @@ { "param-name": "nexus_artifact_repo", "param-value": "${nexus_artifact_repo}" + }, + { + "param-name": "k8s-rb-profile-name", + "param-value": "${k8s-rb-profile-name}" + }, + { + "param-name": "int_private1_gw_ip", + "param-value": "${int_private1_gw_ip}" + }, + { + "param-name": "int_private1_net_id", + "param-value": "${vnf_name}-unprotected-network" + }, + { + "param-name": "int_private1_subnet_id", + "param-value": "${int_private1_net_id}-subnet-1" + }, + { + "param-name": "int_private2_gw_ip", + "param-value": "${int_private2_gw_ip}" + }, + { + "param-name": "int_private2_net_id", + "param-value": "${vnf_name}-protected-network" + }, + { + "param-name": "int_private2_subnet_id", + "param-value": "${int_private2_net_id}-subnet-1" + }, + { + "param-name": "onap_private_gw_ip", + "param-value": "${onap_private_gw_ip}" } ], "capability-data": [ @@ -299,4 +328,4 @@ ] } ] -}
\ No newline at end of file +} 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 8d17414c..801d3398 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json @@ -519,7 +519,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "private2-prefix-id", @@ -540,7 +540,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "management-prefix-id", @@ -769,5 +769,81 @@ "vnf-id" ], "version": 0 + }, + { + "name": "dcae_collector_ip", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "10.0.4.1" + }, + "input-param": false, + "dictionary-name": "dcae_collector_ip", + "dictionary-source": "default", + "dependencies": [ + "service-instance-id", + "vnf-id" + ], + "version": 0 + }, + { + "name": "dcae_collector_port", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "30235" + }, + "input-param": false, + "dictionary-name": "dcae_collector_port", + "dictionary-source": "default", + "dependencies": [ + "service-instance-id", + "vnf-id" + ], + "version": 0 + }, + { + "name": "k8s-rb-profile-name", + "property": { + "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.", + "type": "string" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-name", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private1_net_id", + "property": { + "description": "Private unprotected network identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private1_net_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] } -]
\ No newline at end of file +] 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 ecbbf554..bec8cfb0 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl @@ -4,10 +4,7 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", "param-value": "${vnf_name}" @@ -56,7 +53,7 @@ "param-name": "nfc-naming-code", "param-value": "${nfc-naming-code}" }, - + { "param-name": "vpg_image_name", "param-value": "${vpg_image_name}" @@ -102,6 +99,14 @@ "param-value": "${vsn_int_private2_ip_0}" }, { + "param-name": "dcae_collector_ip", + "param-value": "$(dcae_collector_ip)" + }, + { + "param-name": "dcae_collector_port", + "param-value": "$(dcae_collector_port)" + }, + { "param-name": "demo_artifacts_version", "param-value": "${demo_artifacts_version}}" }, @@ -128,9 +133,15 @@ { "param-name": "vpg_onap_private_ip_0", "param-value": "${vpg_onap_private_ip_0}" + }, + { + "param-name": "k8s-rb-profile-name", + "param-value": "${k8s-rb-profile-name}" + }, + { + "param-name": "int_private1_net_id", + "param-value": "${int_private1_net_id}" } - - ], "capability-data": [ { @@ -222,7 +233,7 @@ } ] }, - + { "capability-name": "aai-vf-module-put", "key-mapping": [ @@ -243,4 +254,4 @@ ] } ] -}
\ No newline at end of file +} 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 532e157f..a4b74507 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json @@ -43,7 +43,7 @@ ], "version": 0 }, - + { "name": "vf-module-name", "property": { @@ -88,54 +88,6 @@ "version": 0 }, { - "name": "dcae_collector_ip", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - {} - ], - "entry_schema": { - "type": "" - }, - "default": "10.0.4.1" - }, - "input-param": false, - "dictionary-name": "dcae_collector_ip", - "dictionary-source": "default", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], - "version": 0 - }, - { - "name": "dcae_collector_port", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - {} - ], - "entry_schema": { - "type": "" - }, - "default": "30235" - }, - "input-param": false, - "dictionary-name": "dcae_collector_port", - "dictionary-source": "default", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], - "version": 0 - }, - { "name": "demo_artifacts_version", "property": { "description": "", @@ -747,7 +699,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "private1-prefix-id", @@ -768,7 +720,7 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "management-prefix-id", @@ -789,12 +741,54 @@ "entry_schema": { "type": "" } - + }, "input-param": false, "dictionary-name": "private2-prefix-id", "dictionary-source": "processor-db", "dependencies": [], "version": 0 + }, + { + "name": "k8s-rb-profile-name", + "property": { + "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.", + "type": "string" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-name", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private2_gw_ip", + "property": { + "description": "Private protected network gateway ip", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private2_gw_ip", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "int_private2_net_id", + "property": { + "description": "Private protected network identification", + "type": "string" + }, + "input-param": false, + "dictionary-name": "int_private2_net_id", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] } -]
\ No newline at end of file +] 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 c70e689b..60b8ecd2 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl @@ -4,10 +4,7 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", "param-value": "${vnf_name}" @@ -65,10 +62,10 @@ { "param-name": "public_net_id", "param-value": "${public_net_id}" - }, + }, + - { "param-name": "int_private2_net_cidr", "param-value": "${int_private2_net_cidr}" @@ -96,15 +93,15 @@ { "param-name": "demo_artifacts_version", "param-value": "${demo_artifacts_version}" - }, + }, { "param-name": "install_script_version", "param-value": "${install_script_version}" - }, + }, { "param-name": "key_name", "param-value": "${vnf_name}_key_name" - }, + }, { "param-name": "cloud_env", "param-value": "openstack" @@ -116,10 +113,19 @@ { "param-name": "nexus_artifact_repo", "param-value": "${nexus_artifact_repo}" + }, + { + "param-name": "k8s-rb-profile-name", + "param-value": "${k8s-rb-profile-name}" + }, + { + "param-name": "int_private2_gw_ip", + "param-value": "${int_private2_gw_ip}" + }, + { + "param-name": "int_private2_net_id", + "param-value": "${int_private2_net_id}" } - - - ], "capability-data": [ { @@ -258,4 +264,4 @@ ] } ] -}
\ No newline at end of file +} |