From be3024dfe9b6c06419c6f4a5f724a01b7e0ab103 Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Fri, 24 Jan 2020 11:06:14 +0100 Subject: Correct CBA package for vFW_CNF_CDS usecase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes change helm and cba content to enable instantiation with some workarounds. Data dictionary in this review is not ready yet, as well as there are many workarounds within. Signed-off-by: Konrad Bańka Issue-ID: INT-1260 Change-Id: I4833fa11772b7bd2b65d04f0d81ffad22570d309 --- heat/vFW_CNF_CDS/templates/base/MANIFEST.json | 4 ++++ heat/vFW_CNF_CDS/templates/base/base_template.env | 4 +++- heat/vFW_CNF_CDS/templates/base/base_template.yaml | 14 +++++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) (limited to 'heat/vFW_CNF_CDS/templates/base') diff --git a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json b/heat/vFW_CNF_CDS/templates/base/MANIFEST.json index aebb1462..cd971cd6 100644 --- a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json +++ b/heat/vFW_CNF_CDS/templates/base/MANIFEST.json @@ -2,6 +2,10 @@ "name": "virtualFirewall", "description": "", "data": [ + { + "file": "vFW_CDS_CNF.zip", + "type": "CONTROLLER_BLUEPRINT_ARCHIVE" + }, { "file": "base_template.yaml", "type": "HEAT", diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.env b/heat/vFW_CNF_CDS/templates/base/base_template.env index 0a69e08d..53735a9f 100644 --- a/heat/vFW_CNF_CDS/templates/base/base_template.env +++ b/heat/vFW_CNF_CDS/templates/base/base_template.env @@ -2,4 +2,6 @@ parameters: int_private1_net_cidr: 192.168.10.0/24 int_private2_net_cidr: 192.168.20.0/24 pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - vnf_name: vFW_NextGen \ No newline at end of file + vnf_name: vFW_NextGen + vnf_id: 12345 + vf_module_id: 123456 diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.yaml b/heat/vFW_CNF_CDS/templates/base/base_template.yaml index 403b0e4c..da065076 100644 --- a/heat/vFW_CNF_CDS/templates/base/base_template.yaml +++ b/heat/vFW_CNF_CDS/templates/base/base_template.yaml @@ -48,6 +48,14 @@ parameters: vnf_name: type: string description: VNF_NAME + vnf_id: + type: string + label: VNF ID + description: The VNF ID is provided by ONAP + vf_module_id: + type: string + label: VF Module ID + description: The VF Module ID is provided by ONAP ############# # # @@ -67,8 +75,12 @@ resources: get_param: pub_key vnf_name: get_param: vnf_name + vnf_id: + get_param: vnf_id + vf_module_id: + get_param: vf_module_id - #SDC won't allow too dummy resource as it has to find `topology_template` TOSCA equivalent in heat templates + #SDC won't allow too dummy resource as it has to find 'topology_template' TOSCA equivalent in heat templates dummy_base: type: OS::Nova::Server properties: -- cgit 1.2.3-korg