##########################################################################\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 Closed Loop demo app (FW and Sink) for ONAP\r
+description: Heat template that deploys vFirewall Closed Loop demo app (vFW and vSink) 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: 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 subnetwork name or ID\r
+ description: Private subnetwork of the protected 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_id:\r
type: string\r
label: Protected private network name or ID\r
description: Private network that connects vFirewall with vSink\r
+ protected_private_subnet_id:\r
+ type: string\r
+ label: Protected private subnetwork name or ID\r
+ description: Private subnetwork of the unprotected 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
- 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_cidr:\r
type: string\r
label: ONAP private network CIDR\r
properties:\r
name: { get_param: unprotected_private_net_id }\r
\r
- protected_private_network:\r
- type: OS::Neutron::Net\r
- properties:\r
- name: { get_param: protected_private_net_id }\r
-\r
unprotected_private_subnet:\r
type: OS::Neutron::Subnet\r
properties:\r
network_id: { get_resource: unprotected_private_network }\r
cidr: { get_param: unprotected_private_net_cidr }\r
\r
+ protected_private_network:\r
+ type: OS::Neutron::Net\r
+ properties:\r
+ name: { get_param: protected_private_net_id }\r
+\r
protected_private_subnet:\r
type: OS::Neutron::Subnet\r
properties:\r
vfw_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: vfw_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 "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt\r
echo "__protected_private_net_cidr__" > /opt/config/protected_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_firewall_install.sh -o /opt/v_firewall_install.sh\r
cd /opt\r
vsn_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: vsn_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 "__protected_net_gw__" > /opt/config/protected_net_gw.txt\r
echo "__protected_private_net_cidr__" > /opt/config/protected_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_sink_install.sh -o /opt/v_sink_install.sh\r
cd /opt\r