aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2018-09-11 15:06:07 -0400
committerMarco Platania <platania@research.att.com>2018-09-11 15:06:07 -0400
commitdf9f7186c2f2de3f4af21aa13f7cc613c4607df3 (patch)
tree2afdb14677e50add838bde4e9f5cef4d4054dd74
parent24f5b5575b0736eba361cd5b544af873156317f0 (diff)
Update vFW Heat Template for CDS use
- The update targets the vFW Heat template (note: this is not vFWCL!) - Declare SDNC metadata in the Heat template - Assign a values to metadata parameters (placeholders for now) - Add metadata to each VM in the Heat template Change-Id: I837bb5a58af16c11f6b99adf4f3173bc3f7178ce Issue-ID: CCSDK-493 Signed-off-by: Marco Platania <platania@research.att.com>
-rw-r--r--heat/vFW/base_vfw.env7
-rw-r--r--heat/vFW/base_vfw.yaml15
2 files changed, 17 insertions, 5 deletions
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env
index f74b12bf..269bb097 100644
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -1,5 +1,5 @@
parameters:
- vfw_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
+ vfw_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404 required)
vfw_flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
public_net_id: PUT THE PUBLIC NETWORK ID HERE
unprotected_private_net_id: zdfw1fwl01_unprotected
@@ -27,5 +27,8 @@ parameters:
install_script_version: 1.3.0-SNAPSHOT
key_name: vfw_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: PUT openstack OR rackspace HERE
+ cloud_env: openstack
sec_group: PUT THE ONAP SECURITY GROUP HERE
+ sdnc_model_name: vFW_spinup
+ sdnc_model_version: 1.0.0
+ sdnc_artifact_name: vFW_vNF_Artifact
diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml
index 58bbd946..32a03f15 100644
--- a/heat/vFW/base_vfw.yaml
+++ b/heat/vFW/base_vfw.yaml
@@ -156,6 +156,15 @@ parameters:
sec_group:
type: string
description: ONAP Security Group
+ sdnc_model_name:
+ type: string
+ description: SDNC Model Name metatada
+ sdnc_model_version:
+ type: string
+ description: SDNC Model Version metatada
+ sdnc_artifact_name:
+ type: string
+ description: SDNC Artifact Name metatada
#############
# #
@@ -241,7 +250,7 @@ resources:
- port: { get_resource: vfw_private_0_port }
- port: { get_resource: vfw_private_1_port }
- port: { get_resource: vfw_private_2_port }
- metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+ metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
user_data_format: RAW
user_data:
str_replace:
@@ -314,7 +323,7 @@ resources:
- network: { get_param: public_net_id }
- port: { get_resource: vpg_private_0_port }
- port: { get_resource: vpg_private_1_port }
- metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+ metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
user_data_format: RAW
user_data:
str_replace:
@@ -385,7 +394,7 @@ resources:
- network: { get_param: public_net_id }
- port: { get_resource: vsn_private_0_port }
- port: { get_resource: vsn_private_1_port }
- metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+ metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }}
user_data_format: RAW
user_data:
str_replace: