From c7022a1a9b26b5a9fe9729faf827d6f04de8be01 Mon Sep 17 00:00:00 2001 From: "stark, steven" Date: Thu, 31 Jan 2019 13:51:07 -0800 Subject: [VVP] update templates for vFWCL Change-Id: I7c5f7525d86b69874dc9718b6086229294a9c9fb Issue-ID: VVP-156 Signed-off-by: stark, steven --- heat/vFWCL/vPKG/base_vpkg.env | 36 ++++++++++++++++++++++++---------- heat/vFWCL/vPKG/base_vpkg.yaml | 44 +++++++++++++++++++++++++----------------- 2 files changed, 52 insertions(+), 28 deletions(-) (limited to 'heat/vFWCL/vPKG') diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env index 4c81d4be..6a1b33e3 100644 --- a/heat/vFWCL/vPKG/base_vpkg.env +++ b/heat/vFWCL/vPKG/base_vpkg.env @@ -1,24 +1,40 @@ parameters: - image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404) - flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested) + + # VM_TYPE: vpg + vpg_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404) + vpg_flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested) + vpg_unprotected_private_ip_0: 192.168.10.200 + vpg_onap_private_ip_0: 10.0.100.2 + vpg_name_0: zdfw1fwl01pgn01 + + # NETWORK_ROLE: public public_net_id: PUT THE PUBLIC NETWORK ID HERE - unprotected_private_net_id: zdfw1fwl01_unprotected - unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub + + # NETWORK_ROLE: unprotected_private + unprotected_private_net_id: vFWSNK_zdfw1fwl01_unprotected + unprotected_private_subnet_id: vFWSNK_zdfw1fwl01_unprotected_sub unprotected_private_net_cidr: 192.168.10.0/24 + + # NETWORK_ROLE: onap_private onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE onap_private_net_cidr: 10.0.0.0/16 + + # NETWORK_ROLE: protected_private protected_private_net_cidr: 192.168.20.0/24 - vfw_private_ip_0: 192.168.10.100 - vpg_private_ip_0: 192.168.10.200 - vpg_private_ip_1: 10.0.100.2 - vsn_private_ip_0: 192.168.20.250 - vpg_name_0: zdfw1fwl01pgn01 + + # METADATA + vnf_name: vPGK vnf_id: vPNG_Firewall_demo_app vf_module_id: vTrafficPNG + + # APP/USER_DATA + vfw_private_ip_0: 192.168.10.100 + vsn_private_ip_0: 192.168.20.250 demo_artifacts_version: 1.3.0-SNAPSHOT install_script_version: 1.3.0-SNAPSHOT key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE cloud_env: PUT openstack OR rackspace HERE - sec_group: PUT THE ONAP SECURITY GROUP HERE \ No newline at end of file + sec_group: PUT THE ONAP SECURITY GROUP HERE + nexus_artifact_repo: https://nexus.onap.org \ No newline at end of file diff --git a/heat/vFWCL/vPKG/base_vpkg.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml index e06a83fb..7efb2e9c 100644 --- a/heat/vFWCL/vPKG/base_vpkg.yaml +++ b/heat/vFWCL/vPKG/base_vpkg.yaml @@ -33,11 +33,11 @@ description: Heat template that deploys the vFirewall Traffic Generator demo app ############## parameters: - image_name: + vpg_image_name: type: string label: Image name or ID description: Image to be used for compute instance - flavor_name: + vpg_flavor_name: type: string label: Flavor description: Type of instance (flavor) to be used @@ -81,11 +81,11 @@ parameters: type: string label: vSink private IP address towards the protected network description: Private IP address that is assigned to the vSink to communicate with the vFirewall - vpg_private_ip_0: + vpg_unprotected_private_ip_0: type: string label: vPacketGenerator private IP address towards the unprotected network description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall - vpg_private_ip_1: + vpg_onap_private_ip_0: type: string label: vPacketGenerator private IP address towards the ONAP management network description: Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components @@ -93,6 +93,10 @@ parameters: type: string label: vPacketGenerator name description: Name of the vPacketGenerator + vnf_name: + type: string + label: VNF NAME + description: The VNF NAME is provided by ONAP vnf_id: type: string label: VNF ID @@ -120,7 +124,7 @@ parameters: nexus_artifact_repo: type: string description: Root URL for the Nexus repository for Maven artifacts. - default: "https://nexus.onap.org" + #default: "https://nexus.onap.org" cloud_env: type: string label: Cloud environment @@ -146,8 +150,9 @@ resources: properties: name: str_replace: - template: base_rand + template: vnfname_base_rand params: + vnfname: { get_param: vnf_name } base: { get_param: key_name } rand: { get_resource: random-str } public_key: { get_param: pub_key } @@ -155,34 +160,37 @@ resources: # Virtual Packet Generator instantiation - vpg_private_0_port: + vpg_0_unprotected_private_port_0: type: OS::Neutron::Port properties: network: { get_param: unprotected_private_net_id } - fixed_ips: [{"subnet": { get_param: unprotected_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_0 }}] + fixed_ips: [{"subnet": { get_param: unprotected_private_subnet_id }, "ip_address": { get_param: vpg_unprotected_private_ip_0 }}] security_groups: - { get_param: sec_group } - vpg_private_1_port: + vpg_0_onap_private_port_0: type: OS::Neutron::Port properties: network: { get_param: onap_private_net_id } - fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_1 }}] + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_onap_private_ip_0 }}] security_groups: - { get_param: sec_group } - vpg_0: + vpg_server_0: type: OS::Nova::Server properties: - image: { get_param: image_name } - flavor: { get_param: flavor_name } + image: { get_param: vpg_image_name } + flavor: { get_param: vpg_flavor_name } name: { get_param: vpg_name_0 } key_name: { get_resource: my_keypair } networks: - 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 }} + - port: { get_resource: vpg_0_unprotected_private_port_0 } + - port: { get_resource: vpg_0_onap_private_port_0 } + metadata: + vnf_name: { get_param: vnf_name } + vnf_id: { get_param: vnf_id } + vf_module_id: { get_param: vf_module_id } user_data_format: RAW user_data: str_replace: @@ -192,8 +200,8 @@ resources: __sink_ipaddr__: { get_param: vsn_private_ip_0 } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } - __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 } - __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 } + __vpg_private_ip_0__ : { get_param: vpg_unprotected_private_ip_0 } + __vpg_private_ip_1__ : { get_param: vpg_onap_private_ip_0 } __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } __cloud_env__ : { get_param: cloud_env } -- cgit 1.2.3-korg