From: Marco Platania Date: Sat, 4 Nov 2017 21:05:29 +0000 (-0400) Subject: Cleanup vFW/vPacketGen templates for closed loop X-Git-Tag: 1.0.0-Amsterdam~44^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=d68f408326e682a276835f4906fd615413110e4c Cleanup vFW/vPacketGen templates for closed loop - Parameters renaming - Remove redundancy - Remove unused parameters Change-Id: I978e3a815d321e831481e7755ce59c514fc90b86 Issue-ID: POLICY-409 Signed-off-by: Marco Platania --- diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml index 4fb19c00..3d5a22d1 100644 --- a/heat/vFW/base_vfw.yaml +++ b/heat/vFW/base_vfw.yaml @@ -1,7 +1,7 @@ ########################################################################## # #==================LICENSE_START========================================== -# +# # # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. # @@ -256,7 +256,7 @@ resources: __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash - + # Create configuration files mkdir /opt/config echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt @@ -272,7 +272,7 @@ resources: echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - + # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh cd /opt @@ -323,7 +323,7 @@ resources: __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash - + # Create configuration files mkdir /opt/config echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt @@ -338,7 +338,7 @@ resources: echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - + # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh cd /opt @@ -387,7 +387,7 @@ resources: __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash - + # Create configuration files mkdir /opt/config echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt @@ -399,7 +399,7 @@ resources: echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - + # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh cd /opt diff --git a/heat/vFWCL/vFWSNK/MANIFEST.json b/heat/vFWCL/vFWSNK/MANIFEST.json index 9f4dc524..49383787 100644 --- a/heat/vFWCL/vFWSNK/MANIFEST.json +++ b/heat/vFWCL/vFWSNK/MANIFEST.json @@ -1,14 +1,14 @@ { - "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" } ] diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env index 56228cc9..84ed850f 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.env +++ b/heat/vFWCL/vFWSNK/base_vfw.env @@ -1,29 +1,32 @@ -parameters: - vfw_image_name: PUT THE VM IMAGE NAME HERE - vfw_flavor_name: PUT THE VM FLAVOR NAME HERE - public_net_id: PUT THE PUBLIC NETWORK ID HERE - unprotected_private_net_id: zdfw1fwl01_unprotected - protected_private_net_id: zdfw1fwl01_protected - onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - unprotected_private_net_cidr: 192.168.10.0/24 - protected_private_net_cidr: 192.168.20.0/24 - 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 - 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: 10.0.4.102 - dcae_collector_port: 8080 - repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging +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 - key_name: vfw_key - pub_key: PUT YOUR KEY HEERE - cloud_env: PUT openstack OR rackspace HERE + install_script_version: 1.1.0-SNAPSHOT + key_name: vfw_key + pub_key: PUT YOUR KEY HERE + cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml index 514de349..c82e2e56 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.yaml +++ b/heat/vFWCL/vFWSNK/base_vfw.yaml @@ -1,7 +1,7 @@ ########################################################################## # #==================LICENSE_START========================================== -# +# # # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. # @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template that deploys vFirewall Closed Loop demo app (FW and Sink) for ONAP +description: Heat template that deploys vFirewall Closed Loop demo app (vFW and vSink) for ONAP ############## # # @@ -33,11 +33,11 @@ description: Heat template that deploys vFirewall Closed Loop demo app (FW and S ############## parameters: - vfw_image_name: + image_name: type: string label: Image name or ID description: Image to be used for compute instance - vfw_flavor_name: + flavor_name: type: string label: Flavor description: Type of instance (flavor) to be used @@ -49,10 +49,26 @@ parameters: type: string label: Unprotected private network name or ID description: Private network that connects vPacketGenerator with vFirewall + unprotected_private_subnet_id: + type: string + label: Unprotected private subnetwork name or ID + description: Private subnetwork of the protected network + unprotected_private_net_cidr: + type: string + label: Unprotected private network CIDR + description: The CIDR of the unprotected private network protected_private_net_id: type: string label: Protected private network name or ID description: Private network that connects vFirewall with vSink + protected_private_subnet_id: + type: string + label: Protected private subnetwork name or ID + description: Private subnetwork of the unprotected network + protected_private_net_cidr: + type: string + label: Protected private network CIDR + description: The CIDR of the protected private network onap_private_net_id: type: string label: ONAP management network name or ID @@ -61,14 +77,6 @@ parameters: type: string label: ONAP management sub-network name or ID description: Private sub-network that connects ONAP components and the VNF - unprotected_private_net_cidr: - type: string - label: Unprotected private network CIDR - description: The CIDR of the unprotected private network - protected_private_net_cidr: - type: string - label: Protected private network CIDR - description: The CIDR of the protected private network onap_private_net_cidr: type: string label: ONAP private network CIDR @@ -179,11 +187,6 @@ resources: properties: name: { get_param: unprotected_private_net_id } - protected_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: protected_private_net_id } - unprotected_private_subnet: type: OS::Neutron::Subnet properties: @@ -191,6 +194,11 @@ resources: network_id: { get_resource: unprotected_private_network } cidr: { get_param: unprotected_private_net_cidr } + protected_private_network: + type: OS::Neutron::Net + properties: + name: { get_param: protected_private_net_id } + protected_private_subnet: type: OS::Neutron::Subnet properties: @@ -221,8 +229,8 @@ resources: vfw_0: type: OS::Nova::Server properties: - image: { get_param: vfw_image_name } - flavor: { get_param: vfw_flavor_name } + image: { get_param: image_name } + flavor: { get_param: flavor_name } name: { get_param: vfw_name_0 } key_name: { get_resource: my_keypair } networks: @@ -250,7 +258,7 @@ resources: __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash - + # Create configuration files mkdir /opt/config echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt @@ -266,7 +274,7 @@ resources: echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - + # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh cd /opt @@ -290,8 +298,8 @@ resources: vsn_0: type: OS::Nova::Server properties: - image: { get_param: vfw_image_name } - flavor: { get_param: vfw_flavor_name } + image: { get_param: image_name } + flavor: { get_param: flavor_name } name: { get_param: vsn_name_0 } key_name: { get_resource: my_keypair } networks: @@ -315,7 +323,7 @@ resources: __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash - + # Create configuration files mkdir /opt/config echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt @@ -327,7 +335,7 @@ resources: echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - + # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh cd /opt diff --git a/heat/vFWCL/vPKG/MANIFEST.json b/heat/vFWCL/vPKG/MANIFEST.json new file mode 100644 index 00000000..482b4294 --- /dev/null +++ b/heat/vFWCL/vPKG/MANIFEST.json @@ -0,0 +1,17 @@ +{ + "name": "", + "description": "", + "data": [ + { + "file": "base_vpkg.yaml", + "type": "HEAT", + "isBase": "true", + "data": [ + { + "file": "base_vpkg.env", + "type": "HEAT_ENV" + } + ] + } + ] +} diff --git a/heat/vFWCL/vPNG/base_vpng.env b/heat/vFWCL/vPKG/base_vpkg.env similarity index 74% rename from heat/vFWCL/vPNG/base_vpng.env rename to heat/vFWCL/vPKG/base_vpkg.env index 1749fc5c..a7a30e32 100644 --- a/heat/vFWCL/vPNG/base_vpng.env +++ b/heat/vFWCL/vPKG/base_vpkg.env @@ -1,27 +1,25 @@ -parameters: - vfw_image_name: PUT THE VM IMAGE NAME HERE - vfw_flavor_name: PUT THE VM FLAVOR NAME HERE - public_net_id: PUT THE PUBLIC NETWORK ID HERE - unprotected_private_network_id: zdfw1fwl01_unprotected - unprotected_private_subnet_id: zdfw1fwl01_unprotected - onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - unprotected_private_net_cidr: 192.168.10.0/24 - protected_private_net_cidr: 192.168.20.0/24 - onap_private_net_cidr: 10.0.0.0/16 - 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 - dcae_collector_ip: 10.0.4.102 - dcae_collector_port: 8080 - repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging +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 - key_name: vfw_key + 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 + cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL/vPNG/base_vpng.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml similarity index 90% rename from heat/vFWCL/vPNG/base_vpng.yaml rename to heat/vFWCL/vPKG/base_vpkg.yaml index 7243f106..79d35bd3 100644 --- a/heat/vFWCL/vPNG/base_vpng.yaml +++ b/heat/vFWCL/vPKG/base_vpkg.yaml @@ -1,7 +1,7 @@ ########################################################################## # #==================LICENSE_START========================================== -# +# # # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. # @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template that deploys vFirewall Traffic Generator demo app for ONAP +description: Heat template that deploys the vFirewall Traffic Generator demo app for ONAP ############## # # @@ -33,11 +33,11 @@ description: Heat template that deploys vFirewall Traffic Generator demo app for ############## parameters: - vfw_image_name: + image_name: type: string label: Image name or ID description: Image to be used for compute instance - vfw_flavor_name: + flavor_name: type: string label: Flavor description: Type of instance (flavor) to be used @@ -45,14 +45,22 @@ parameters: type: string label: Public network name or ID description: Public network that enables remote connection to VNF - unprotected_private_network_id: + unprotected_private_net_id: type: string label: Unprotected private network name or ID description: Private network that connects vPacketGenerator with vFirewall unprotected_private_subnet_id: type: string label: Unprotected private sub-network name or ID - description: Private sub-network that connects vPacketGenerator with vFirewall + description: Private subnetwork for the unprotected network + unprotected_private_net_cidr: + type: string + label: Unprotected private network CIDR + description: The CIDR of the unprotected private network + protected_private_net_cidr: + type: string + label: Protected private network CIDR + description: The CIDR of the protected private network onap_private_net_id: type: string label: ONAP management network name or ID @@ -61,30 +69,18 @@ parameters: type: string label: ONAP management sub-network name or ID description: Private sub-network that connects ONAP components and the VNF - unprotected_private_net_cidr: - type: string - label: Unprotected private network CIDR - description: The CIDR of the unprotected private network onap_private_net_cidr: type: string label: ONAP private network CIDR description: The CIDR of the protected private network - vfw_private_ip_0: type: string label: vFirewall private IP address towards the unprotected network description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator - - protected_private_net_cidr: - type: string - label: Protected private network CIDR - description: The CIDR of the protected private network - vsn_private_ip_0: 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: type: string label: vPacketGenerator private IP address towards the unprotected network @@ -105,14 +101,6 @@ parameters: type: string label: vPNG Traffic Generator module ID description: The vPNG Module ID is provided by ONAP - dcae_collector_ip: - type: string - label: DCAE collector IP address - description: IP address of the DCAE collector - dcae_collector_port: - type: string - label: DCAE collector port - description: Port of the DCAE collector key_name: type: string label: Key pair name @@ -171,7 +159,7 @@ resources: vpg_private_0_port: type: OS::Neutron::Port properties: - network: { get_param: unprotected_private_network_id } + network: { get_param: unprotected_private_net_id } fixed_ips: [{"subnet": { get_param: unprotected_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_0 }}] vpg_private_1_port: @@ -183,8 +171,8 @@ resources: vpg_0: type: OS::Nova::Server properties: - image: { get_param: vfw_image_name } - flavor: { get_param: vfw_flavor_name } + image: { get_param: image_name } + flavor: { get_param: flavor_name } name: { get_param: vpg_name_0 } key_name: { get_resource: my_keypair } networks: @@ -210,7 +198,7 @@ resources: __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash - + # Create configuration files mkdir /opt/config echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt @@ -225,7 +213,7 @@ resources: echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - + # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh cd /opt diff --git a/heat/vFWCL/vPNG/MANIFEST.json b/heat/vFWCL/vPNG/MANIFEST.json deleted file mode 100644 index ecb6fe7e..00000000 --- a/heat/vFWCL/vPNG/MANIFEST.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "", - "description": "", - "data": [ - { - "file": "base_vpng.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_vpng.env", - "type": "HEAT_ENV" - } - ] - } - ] -}