##########################################################################\r
#\r
#==================LICENSE_START==========================================\r
-# \r
+#\r
#\r
# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.\r
#\r
\r
heat_template_version: 2013-05-23\r
\r
-description: Heat template that deploys vFirewall Traffic Generator demo app for ONAP\r
+description: Heat template that deploys the vFirewall Traffic Generator demo app for ONAP\r
\r
##############\r
# #\r
##############\r
\r
parameters:\r
- vfw_image_name:\r
+ image_name:\r
type: string\r
label: Image name or ID\r
description: Image to be used for compute instance\r
- vfw_flavor_name:\r
+ flavor_name:\r
type: string\r
label: Flavor\r
description: Type of instance (flavor) to be used\r
type: string\r
label: Public network name or ID\r
description: Public network that enables remote connection to VNF\r
- unprotected_private_network_id:\r
+ unprotected_private_net_id:\r
type: string\r
label: Unprotected private network name or ID\r
description: Private network that connects vPacketGenerator with vFirewall\r
unprotected_private_subnet_id:\r
type: string\r
label: Unprotected private sub-network name or ID\r
- description: Private sub-network that connects vPacketGenerator with vFirewall\r
+ description: Private subnetwork for the unprotected network\r
+ unprotected_private_net_cidr:\r
+ type: string\r
+ label: Unprotected private network CIDR\r
+ description: The CIDR of the unprotected private network\r
+ protected_private_net_cidr:\r
+ type: string\r
+ label: Protected private network CIDR\r
+ description: The CIDR of the protected private network\r
onap_private_net_id:\r
type: string\r
label: ONAP management network name or ID\r
type: string\r
label: ONAP management sub-network name or ID\r
description: Private sub-network that connects ONAP components and the VNF\r
- unprotected_private_net_cidr:\r
- type: string\r
- label: Unprotected private network CIDR\r
- description: The CIDR of the unprotected private network\r
onap_private_net_cidr:\r
type: string\r
label: ONAP private network CIDR\r
description: The CIDR of the protected private network\r
-\r
vfw_private_ip_0:\r
type: string\r
label: vFirewall private IP address towards the unprotected network\r
description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator\r
-\r
- protected_private_net_cidr:\r
- type: string\r
- label: Protected private network CIDR\r
- description: The CIDR of the protected private network\r
-\r
vsn_private_ip_0:\r
type: string\r
label: vSink private IP address towards the protected network\r
description: Private IP address that is assigned to the vSink to communicate with the vFirewall\r
-\r
vpg_private_ip_0:\r
type: string\r
label: vPacketGenerator private IP address towards the unprotected network\r
type: string\r
label: vPNG Traffic Generator module ID\r
description: The vPNG Module ID is provided by ONAP\r
- dcae_collector_ip:\r
- type: string\r
- label: DCAE collector IP address\r
- description: IP address of the DCAE collector\r
- dcae_collector_port:\r
- type: string\r
- label: DCAE collector port\r
- description: Port of the DCAE collector\r
key_name:\r
type: string\r
label: Key pair name\r
vpg_private_0_port:\r
type: OS::Neutron::Port\r
properties:\r
- network: { get_param: unprotected_private_network_id }\r
+ network: { get_param: unprotected_private_net_id }\r
fixed_ips: [{"subnet": { get_param: unprotected_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_0 }}]\r
\r
vpg_private_1_port:\r
vpg_0:\r
type: OS::Nova::Server\r
properties:\r
- image: { get_param: vfw_image_name }\r
- flavor: { get_param: vfw_flavor_name }\r
+ image: { get_param: image_name }\r
+ flavor: { get_param: flavor_name }\r
name: { get_param: vpg_name_0 }\r
key_name: { get_resource: my_keypair }\r
networks:\r
__cloud_env__ : { get_param: cloud_env }\r
template: |\r
#!/bin/bash\r
- \r
+\r
# Create configuration files\r
mkdir /opt/config\r
echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt\r
echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt\r
echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt\r
echo "__cloud_env__" > /opt/config/cloud_env.txt\r
- \r
+\r
# Download and run install script\r
curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh\r
cd /opt\r