VNF Software Version parameter added to CDS Heat templates

VNF Software Version parameter added to CDS base heat templates.
The purpose is to give a possibility to set the value of the
software-version attribute in generic-vnf object in time of VNF
instantiation.

Change-Id: Ia8c6d446dd538fb8ee58e4504d62ac3f2edc71e6
Issue-ID: INT-1600
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>

diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.env b/heat/vFW_CNF_CDS/templates/base/base_template.env
index 16d0a6a..c904a66 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/base/base_template.env
+++ b/heat/vFW_CNF_CDS/templates/base/base_template.env
@@ -2,3 +2,4 @@ parameters:
   vnf_name: vFW_CDS_CNF
   vnf_id: vFirewall_demo_app
   vf_module_id: vFirewallNet
+  vnf_software_version: 1.0.0
\ No newline at end of file

diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.yaml b/heat/vFW_CNF_CDS/templates/base/base_template.yaml
index fbcf181..8d796e9 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/base/base_template.yaml
+++ b/heat/vFW_CNF_CDS/templates/base/base_template.yaml
@@ -45,6 +45,11 @@ parameters:
     type: string
     label: VF Module ID
     description: The VF Module ID is provided by ONAP
+  vnf_software_version:
+    type: string
+    label: VNF software version
+    description: VNF software version
+    default: 1.0.0
 
 #############
 #           #

diff --git a/heat/vFW_NextGen/templates/base_template.env b/heat/vFW_NextGen/templates/base_template.env
index 0a69e08..56230ea 100644 (file)
--- a/heat/vFW_NextGen/templates/base_template.env
+++ b/heat/vFW_NextGen/templates/base_template.env
@@ -2,4 +2,5 @@ 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_software_version: 1.0.0
\ No newline at end of file

diff --git a/heat/vFW_NextGen/templates/base_template.yaml b/heat/vFW_NextGen/templates/base_template.yaml
index 47dce5e..9b53d78 100644 (file)
--- a/heat/vFW_NextGen/templates/base_template.yaml
+++ b/heat/vFW_NextGen/templates/base_template.yaml
@@ -48,6 +48,11 @@ parameters:
   vnf_name:
     type: string
     description: VNF_NAME
+  vnf_software_version:
+    type: string
+    label: VNF software version
+    description: VNF software version
+    default: 1.0.0
 
 #############
 #           #

diff --git a/heat/vLB_CDS/base_template.env b/heat/vLB_CDS/base_template.env
index 38c4e82..c4db948 100644 (file)
--- a/heat/vLB_CDS/base_template.env
+++ b/heat/vLB_CDS/base_template.env
@@ -13,6 +13,7 @@ parameters:
   # METADATA
   vnf_name: vLBMS
   vnf_id: vLoadBalancer_demo_app
+  vnf_software_version: 1.0.0
 
   # PRIVATE KEY
   key_name: vlb_key

diff --git a/heat/vLB_CDS/base_template.yaml b/heat/vLB_CDS/base_template.yaml
index a171595..512bc2d 100644 (file)
--- a/heat/vLB_CDS/base_template.yaml
+++ b/heat/vLB_CDS/base_template.yaml
@@ -58,6 +58,11 @@ parameters:
     type: string
     label: VNF NAME
     description: The VNF NAME is provided by ONAP
+  vnf_software_version:
+    type: string
+    label: VNF software version
+    description: VNF software version
+    default: 1.0.0
   vlb_0_int_pktgen_private_port_0_mac:
     type: string
     label: vLB MAC address