##########################################################################\r
#\r
#==================LICENSE_START==========================================\r
-# \r
+#\r
#\r
# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.\r
#\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
__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
__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
{
- "name": "",
- "description": "",
+ "name": "",
+ "description": "",
"data": [
{
- "file": "base_vfw.yaml",
- "type": "HEAT",
- "isBase": "true",
+ "file": "base_vfw.yaml",
+ "type": "HEAT",
+ "isBase": "true",
"data": [
{
- "file": "base_vfw.env",
+ "file": "base_vfw.env",
"type": "HEAT_ENV"
}
]
-parameters:\r
- vfw_image_name: PUT THE VM IMAGE NAME HERE\r
- vfw_flavor_name: PUT THE VM FLAVOR NAME HERE\r
- public_net_id: PUT THE PUBLIC NETWORK ID HERE\r
- unprotected_private_net_id: zdfw1fwl01_unprotected\r
- protected_private_net_id: zdfw1fwl01_protected\r
- onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
- onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
- unprotected_private_net_cidr: 192.168.10.0/24\r
- protected_private_net_cidr: 192.168.20.0/24\r
- onap_private_net_cidr: 10.0.0.0/16\r
- vfw_private_ip_0: 192.168.10.100\r
- vfw_private_ip_1: 192.168.20.100\r
- vfw_private_ip_2: 10.0.100.1\r
- vsn_private_ip_0: 192.168.20.250\r
- vsn_private_ip_1: 10.0.100.3\r
- vfw_name_0: zdfw1fwl01fwl01\r
- vsn_name_0: zdfw1fwl01snk01\r
- vnf_id: vFirewall_demo_app\r
- vf_module_id: vFirewallCL\r
- dcae_collector_ip: 10.0.4.102\r
- dcae_collector_port: 8080\r
- repo_url_blob: https://nexus.onap.org/content/sites/raw\r
- repo_url_artifacts: https://nexus.onap.org/content/groups/staging\r
+parameters:
+ image_name: PUT THE VM IMAGE NAME HERE
+ flavor_name: PUT THE VM FLAVOR NAME HERE
+ public_net_id: PUT THE PUBLIC NETWORK ID HERE
+ unprotected_private_net_id: zdfw1fwl01_unprotected
+ unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
+ unprotected_private_net_cidr: 192.168.10.0/24
+ protected_private_net_id: zdfw1fwl01_protected
+ protected_private_subnet_id: zdfw1fwl01_protected_sub
+ protected_private_net_cidr: 192.168.20.0/24
+ 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
+ vfw_private_ip_0: 192.168.10.100
+ vfw_private_ip_1: 192.168.20.100
+ vfw_private_ip_2: 10.0.100.1
+ vpg_private_ip_0: 192.168.10.200
+ vsn_private_ip_0: 192.168.20.250
+ vsn_private_ip_1: 10.0.100.3
+ vfw_name_0: zdfw1fwl01fwl01
+ vsn_name_0: zdfw1fwl01snk01
+ vnf_id: vFirewall_demo_app
+ vf_module_id: vFirewallCL
+ dcae_collector_ip: PUT THE ADDRESS OF THE DCAE COLLECTOR HERE
+ dcae_collector_port: 8080
+ repo_url_blob: https://nexus.onap.org/content/sites/raw
+ repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.1.0
- install_script_version: 1.1.0-SNAPSHOT\r
- key_name: vfw_key\r
- pub_key: PUT YOUR KEY HEERE
- cloud_env: PUT openstack OR rackspace HERE\r
+ install_script_version: 1.1.0-SNAPSHOT
+ key_name: vfw_key
+ pub_key: PUT YOUR KEY HERE
+ cloud_env: PUT openstack OR rackspace HERE
##########################################################################\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
--- /dev/null
+{
+ "name": "",
+ "description": "",
+ "data": [
+ {
+ "file": "base_vpkg.yaml",
+ "type": "HEAT",
+ "isBase": "true",
+ "data": [
+ {
+ "file": "base_vpkg.env",
+ "type": "HEAT_ENV"
+ }
+ ]
+ }
+ ]
+}
-parameters:\r
- vfw_image_name: PUT THE VM IMAGE NAME HERE\r
- vfw_flavor_name: PUT THE VM FLAVOR NAME HERE\r
- public_net_id: PUT THE PUBLIC NETWORK ID HERE\r
- unprotected_private_network_id: zdfw1fwl01_unprotected\r
- unprotected_private_subnet_id: zdfw1fwl01_unprotected\r
- onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
- onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
- unprotected_private_net_cidr: 192.168.10.0/24\r
- protected_private_net_cidr: 192.168.20.0/24\r
- onap_private_net_cidr: 10.0.0.0/16\r
- vfw_private_ip_0: 192.168.10.100\r
- vpg_private_ip_0: 192.168.10.200\r
- vpg_private_ip_1: 10.0.100.2\r
- vsn_private_ip_0: 192.168.20.250\r
- vpg_name_0: zdfw1fwl01pgn01\r
- vnf_id: vPNG_Firewall_demo_app\r
- vf_module_id: vTrafficPNG\r
- dcae_collector_ip: 10.0.4.102\r
- dcae_collector_port: 8080\r
- repo_url_blob: https://nexus.onap.org/content/sites/raw\r
- repo_url_artifacts: https://nexus.onap.org/content/groups/staging\r
+parameters:
+ image_name: PUT THE VM IMAGE NAME HERE
+ flavor_name: PUT THE VM FLAVOR NAME HERE
+ public_net_id: PUT THE PUBLIC NETWORK ID HERE
+ unprotected_private_net_id: zdfw1fwl01_unprotected
+ unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
+ unprotected_private_net_cidr: 192.168.10.0/24
+ 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
+ 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
+ vnf_id: vPNG_Firewall_demo_app
+ vf_module_id: vTrafficPNG
+ repo_url_blob: https://nexus.onap.org/content/sites/raw
+ repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.1.0
- install_script_version: 1.1.0-SNAPSHOT\r
- key_name: vfw_key\r
+ install_script_version: 1.1.0-SNAPSHOT
+ key_name: vfw_key
pub_key: PUT YOUR PUBLIC KEY HERE
- cloud_env: PUT openstack OR rackspace HERE\r
+ cloud_env: PUT openstack OR rackspace HERE
##########################################################################\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
+++ /dev/null
-{
- "name": "",
- "description": "",
- "data": [
- {
- "file": "base_vpng.yaml",
- "type": "HEAT",
- "isBase": "true",
- "data": [
- {
- "file": "base_vpng.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-}
Code Review / demo.git / commitdiff