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 <platania@research.att.com>

3 files changed, 0 insertions, 277 deletions

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"
-                }
-            ]
-        }
-    ]
-}
diff --git a/heat/vFWCL/vPNG/base_vpng.env b/heat/vFWCL/vPNG/base_vpng.env
deleted file mode 100644
index 1749fc5c..00000000
--- a/heat/vFWCL/vPNG/base_vpng.env
+++ /dev/null
@@ -1,27 +0,0 @@
-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

-  demo_artifacts_version: 1.1.0
-  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

diff --git a/heat/vFWCL/vPNG/base_vpng.yaml b/heat/vFWCL/vPNG/base_vpng.yaml
deleted file mode 100644
index 7243f106..00000000
--- a/heat/vFWCL/vPNG/base_vpng.yaml
+++ /dev/null
@@ -1,233 +0,0 @@
-##########################################################################

-#

-#==================LICENSE_START==========================================

-# 

-#

-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.

-#

-# Licensed under the Apache License, Version 2.0 (the "License");

-# you may not use this file except in compliance with the License.

-# You may obtain a copy of the License at

-#        http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing, software

-# distributed under the License is distributed on an "AS IS" BASIS,

-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-#

-#==================LICENSE_END============================================

-#

-# ECOMP is a trademark and service mark of AT&T Intellectual Property.

-#

-##########################################################################

-

-heat_template_version: 2013-05-23

-

-description: Heat template that deploys vFirewall Traffic Generator demo app for ONAP

-

-##############

-#            #

-# PARAMETERS #

-#            #

-##############

-

-parameters:

-  vfw_image_name:

-    type: string

-    label: Image name or ID

-    description: Image to be used for compute instance

-  vfw_flavor_name:

-    type: string

-    label: Flavor

-    description: Type of instance (flavor) to be used

-  public_net_id:

-    type: string

-    label: Public network name or ID

-    description: Public network that enables remote connection to VNF

-  unprotected_private_network_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

-  onap_private_net_id:

-    type: string

-    label: ONAP management network name or ID

-    description: Private network that connects ONAP components and the VNF

-  onap_private_subnet_id:

-    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

-    description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall

-  vpg_private_ip_1:

-    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

-  vpg_name_0:

-    type: string

-    label: vPacketGenerator name

-    description: Name of the vPacketGenerator

-  vnf_id:

-    type: string

-    label: VNF ID

-    description: The VNF ID is provided by ONAP

-  vf_module_id:

-    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

-    description: Public/Private key pair name

-  pub_key:

-    type: string

-    label: Public key

-    description: Public key to be installed on the compute instance

-  repo_url_blob:

-    type: string

-    label: Repository URL

-    description: URL of the repository that hosts the demo packages

-  repo_url_artifacts:

-    type: string

-    label: Repository URL

-    description: URL of the repository that hosts the demo packages

-  install_script_version:

-    type: string

-    label: Installation script version number

-    description: Version number of the scripts that install the vFW demo app

-  demo_artifacts_version:

-    type: string

-    label: Artifacts version used in demo vnfs

-    description: Artifacts (jar, tar.gz) version used in demo vnfs

-  cloud_env:

-    type: string

-    label: Cloud environment

-    description: Cloud environment (e.g., openstack, rackspace)

-

-#############

-#           #

-# RESOURCES #

-#           #

-#############

-

-resources:

-  random-str:

-    type: OS::Heat::RandomString

-    properties:

-      length: 4

-

-  my_keypair:

-    type: OS::Nova::KeyPair

-    properties:

-      name:

-        str_replace:

-          template: base_rand

-          params:

-            base: { get_param: key_name }

-            rand: { get_resource: random-str }

-      public_key: { get_param: pub_key }

-      save_private_key: false

-

-

-  # Virtual Packet Generator instantiation

-  vpg_private_0_port:

-    type: OS::Neutron::Port

-    properties:

-      network: { get_param: unprotected_private_network_id }

-      fixed_ips: [{"subnet": { get_param: unprotected_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_0 }}]

-

-  vpg_private_1_port:

-    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 }}]

-

-  vpg_0:

-    type: OS::Nova::Server

-    properties:

-      image: { get_param: vfw_image_name }

-      flavor: { get_param: vfw_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 }}

-      user_data_format: RAW

-      user_data:

-        str_replace:

-          params:

-            __fw_ipaddr__: { get_param: vfw_private_ip_0 }

-            __protected_net_cidr__: { get_param: protected_private_net_cidr }

-            __sink_ipaddr__: { get_param: vsn_private_ip_0 }

-            __repo_url_blob__ : { get_param: repo_url_blob }

-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }

-            __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 }

-            __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 }

-          template: |

-            #!/bin/bash

-            

-            # Create configuration files

-            mkdir /opt/config

-            echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt

-            echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt

-            echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt

-            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt

-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt

-            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt

-            echo "__install_script_version__" > /opt/config/install_script_version.txt

-            echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt

-            echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt

-            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

-            chmod +x v_packetgen_install.sh

-            ./v_packetgen_install.sh