Correct ExternalAPI-NBI init script

Add directory /opt/nbi
Correct docker-compose.yml path

Issue-ID: INT-456

Change-Id: I872da967874c444ae8c76fd9f5784bdadbd00da0
Signed-off-by: Eric Debeau <eric.debeau@orange.com>

6 files changed, 1023 insertions, 1020 deletions

diff --git a/boot/nbi_vm_init.sh b/boot/nbi_vm_init.sh
index 576ec1da..9fac717b 100644
--- a/boot/nbi_vm_init.sh
+++ b/boot/nbi_vm_init.sh
@@ -5,9 +5,12 @@ NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
 NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
 DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
 
-# Fetch the latest docker-compose.yml
+# Create nbi directory
+mkdir /opt/nbi
 cd /opt/nbi
-wget https://git.onap.org/externalapi/nbi/tree/docker-compose.yml?h=master
+
+# Fetch the latest docker-compose.yml
+wget -o docker-compose.yml https://git.onap.org/externalapi/nbi/plain/docker-compose.yml?h=master
 
 # Pull the nbi docker image from nexus
 # MariaDB and mongoDB will be pulled automatically from docker.io during docker-compose
@@ -16,4 +19,4 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull $NEXUS_DOCKER_REPO/onap/externalapi/nbi:$DOCKER_IMAGE_VERSION
 
 # Start nbi, MariaDB and MongoDB containers with docker compose and nbi/docker-compose.yml
-/opt/docker/docker-compose up -d
\ No newline at end of file
+/opt/docker/docker-compose up -d
diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml
index 3d5a22d1..ace7c5e1 100644
--- a/heat/vFW/base_vfw.yaml
+++ b/heat/vFW/base_vfw.yaml
@@ -1,407 +1,407 @@
-##########################################################################

-#

-#==================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 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_net_id:

-    type: string

-    label: Unprotected private network name or ID

-    description: Private network that connects vPacketGenerator with vFirewall

-  protected_private_net_id:

-    type: string

-    label: Protected private network name or ID

-    description: Private network that connects vFirewall with vSink

-  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

-  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

-    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

-  vfw_private_ip_1:

-    type: string

-    label: vFirewall private IP address towards the protected network

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

-  vfw_private_ip_2:

-    type: string

-    label: vFirewall private IP address towards the ONAP management network

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

-  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

-  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

-  vsn_private_ip_1:

-    type: string

-    label: vSink private IP address towards the ONAP management network

-    description: Private IP address that is assigned to the vSink to communicate with ONAP components

-  vfw_name_0:

-    type: string

-    label: vFirewall name

-    description: Name of the vFirewall

-  vpg_name_0:

-    type: string

-    label: vPacketGenerator name

-    description: Name of the vPacketGenerator

-  vsn_name_0:

-    type: string

-    label: vSink name

-    description: Name of the vSink

-  vnf_id:

-    type: string

-    label: VNF ID

-    description: The VNF ID is provided by ONAP

-  vf_module_id:

-    type: string

-    label: vFirewall module ID

-    description: The vFirewall 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

-

-  unprotected_private_network:

-    type: OS::Neutron::Net

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

-      network_id: { get_resource: unprotected_private_network }

-      cidr: { get_param: unprotected_private_net_cidr }

-

-  protected_private_subnet:

-    type: OS::Neutron::Subnet

-    properties:

-      network_id: { get_resource: protected_private_network }

-      cidr: { get_param: protected_private_net_cidr }

-

-  # Virtual Firewall instantiation

-  vfw_private_0_port:

-    type: OS::Neutron::Port

-    properties:

-      network: { get_resource: unprotected_private_network }

-      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]

-

-  vfw_private_1_port:

-    type: OS::Neutron::Port

-    properties:

-      allowed_address_pairs: [{ "ip_address": { get_param: vpg_private_ip_0 }}]

-      network: { get_resource: protected_private_network }

-      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]

-

-  vfw_private_2_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: vfw_private_ip_2 }}]

-

-  vfw_0:

-    type: OS::Nova::Server

-    properties:

-      image: { get_param: vfw_image_name }

-      flavor: { get_param: vfw_flavor_name }

-      name: { get_param: vfw_name_0 }

-      key_name: { get_resource: my_keypair }

-      networks:

-        - network: { get_param: public_net_id }

-        - port: { get_resource: vfw_private_0_port }

-        - port: { get_resource: vfw_private_1_port }

-        - port: { get_resource: vfw_private_2_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:

-            __dcae_collector_ip__ : { get_param: dcae_collector_ip }

-            __dcae_collector_port__ : { get_param: dcae_collector_port }

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

-            __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }

-            __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }

-            __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }

-            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }

-            __protected_private_net_cidr__ : { get_param: protected_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 "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt

-            echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.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 "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt

-            echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt

-            echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt

-            echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt

-            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

-            chmod +x v_firewall_install.sh

-            ./v_firewall_install.sh

-

-

-  # Virtual Packet Generator instantiation

-  vpg_private_0_port:

-    type: OS::Neutron::Port

-    properties:

-      network: { get_resource: unprotected_private_network }

-      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "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

-

-

-  # Virtual Sink instantiation

-  vsn_private_0_port:

-    type: OS::Neutron::Port

-    properties:

-      network: { get_resource: protected_private_network }

-      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]

-

-  vsn_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: vsn_private_ip_1 }}]

-

-  vsn_0:

-    type: OS::Nova::Server

-    properties:

-      image: { get_param: vfw_image_name }

-      flavor: { get_param: vfw_flavor_name }

-      name: { get_param: vsn_name_0 }

-      key_name: { get_resource: my_keypair }

-      networks:

-        - network: { get_param: public_net_id }

-        - port: { get_resource: vsn_private_0_port }

-        - port: { get_resource: vsn_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:

-            __protected_net_gw__: { get_param: vfw_private_ip_1 }

-            __unprotected_net__: { get_param: unprotected_private_net_cidr }

-            __repo_url_blob__ : { get_param: repo_url_blob }

-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }

-            __install_script_version__ : { get_param: install_script_version }

-            __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }

-            __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }

-            __protected_private_net_cidr__ : { get_param: protected_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 "__protected_net_gw__" > /opt/config/protected_net_gw.txt

-            echo "__unprotected_net__" > /opt/config/unprotected_net.txt

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

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

-            echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt

-            echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt

-            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

-            chmod +x v_sink_install.sh

+##########################################################################
+#
+#==================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 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_net_id:
+    type: string
+    label: Unprotected private network name or ID
+    description: Private network that connects vPacketGenerator with vFirewall
+  protected_private_net_id:
+    type: string
+    label: Protected private network name or ID
+    description: Private network that connects vFirewall with vSink
+  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
+  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
+    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
+  vfw_private_ip_1:
+    type: string
+    label: vFirewall private IP address towards the protected network
+    description: Private IP address that is assigned to the vFirewall to communicate with the vSink
+  vfw_private_ip_2:
+    type: string
+    label: vFirewall private IP address towards the ONAP management network
+    description: Private IP address that is assigned to the vFirewall to communicate with ONAP components
+  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
+  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
+  vsn_private_ip_1:
+    type: string
+    label: vSink private IP address towards the ONAP management network
+    description: Private IP address that is assigned to the vSink to communicate with ONAP components
+  vfw_name_0:
+    type: string
+    label: vFirewall name
+    description: Name of the vFirewall
+  vpg_name_0:
+    type: string
+    label: vPacketGenerator name
+    description: Name of the vPacketGenerator
+  vsn_name_0:
+    type: string
+    label: vSink name
+    description: Name of the vSink
+  vnf_id:
+    type: string
+    label: VNF ID
+    description: The VNF ID is provided by ONAP
+  vf_module_id:
+    type: string
+    label: vFirewall module ID
+    description: The vFirewall 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
+
+  unprotected_private_network:
+    type: OS::Neutron::Net
+    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:
+      network_id: { get_resource: unprotected_private_network }
+      cidr: { get_param: unprotected_private_net_cidr }
+
+  protected_private_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      network_id: { get_resource: protected_private_network }
+      cidr: { get_param: protected_private_net_cidr }
+
+  # Virtual Firewall instantiation
+  vfw_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: unprotected_private_network }
+      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]
+
+  vfw_private_1_port:
+    type: OS::Neutron::Port
+    properties:
+      allowed_address_pairs: [{ "ip_address": { get_param: vpg_private_ip_0 }}]
+      network: { get_resource: protected_private_network }
+      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]
+
+  vfw_private_2_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: vfw_private_ip_2 }}]
+
+  vfw_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: vfw_image_name }
+      flavor: { get_param: vfw_flavor_name }
+      name: { get_param: vfw_name_0 }
+      key_name: { get_resource: my_keypair }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vfw_private_0_port }
+        - port: { get_resource: vfw_private_1_port }
+        - port: { get_resource: vfw_private_2_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:
+            __dcae_collector_ip__ : { get_param: dcae_collector_ip }
+            __dcae_collector_port__ : { get_param: dcae_collector_port }
+            __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 }
+            __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }
+            __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }
+            __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }
+            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
+            __protected_private_net_cidr__ : { get_param: protected_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 "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
+            echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.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 "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt
+            echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt
+            echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt
+            echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt
+            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
+            chmod +x v_firewall_install.sh
+            ./v_firewall_install.sh
+
+
+  # Virtual Packet Generator instantiation
+  vpg_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: unprotected_private_network }
+      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "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
+
+
+  # Virtual Sink instantiation
+  vsn_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: protected_private_network }
+      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]
+
+  vsn_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: vsn_private_ip_1 }}]
+
+  vsn_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: vfw_image_name }
+      flavor: { get_param: vfw_flavor_name }
+      name: { get_param: vsn_name_0 }
+      key_name: { get_resource: my_keypair }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vsn_private_0_port }
+        - port: { get_resource: vsn_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:
+            __protected_net_gw__: { get_param: vfw_private_ip_1 }
+            __unprotected_net__: { get_param: unprotected_private_net_cidr }
+            __repo_url_blob__ : { get_param: repo_url_blob }
+            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
+            __install_script_version__ : { get_param: install_script_version }
+            __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
+            __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }
+            __protected_private_net_cidr__ : { get_param: protected_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 "__protected_net_gw__" > /opt/config/protected_net_gw.txt
+            echo "__unprotected_net__" > /opt/config/unprotected_net.txt
+            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
+            echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt
+            echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt
+            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
+            chmod +x v_sink_install.sh
             ./v_sink_install.sh
\ No newline at end of file
diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml
index c82e2e56..fe7f8dc6 100644
--- a/heat/vFWCL/vFWSNK/base_vfw.yaml
+++ b/heat/vFWCL/vFWSNK/base_vfw.yaml
@@ -1,343 +1,343 @@
-##########################################################################

-#

-#==================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 Closed Loop demo app (vFW and vSink) for ONAP

-

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

-#            #

-# PARAMETERS #

-#            #

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

-

-parameters:

-  image_name:

-    type: string

-    label: Image name or ID

-    description: Image to be used for compute instance

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

-    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

-  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

-  vfw_private_ip_1:

-    type: string

-    label: vFirewall private IP address towards the protected network

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

-  vfw_private_ip_2:

-    type: string

-    label: vFirewall private IP address towards the ONAP management network

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

-  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

-  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

-  vsn_private_ip_1:

-    type: string

-    label: vSink private IP address towards the ONAP management network

-    description: Private IP address that is assigned to the vSink to communicate with ONAP components

-  vfw_name_0:

-    type: string

-    label: vFirewall name

-    description: Name of the vFirewall

-  vsn_name_0:

-    type: string

-    label: vSink name

-    description: Name of the vSink

-  vnf_id:

-    type: string

-    label: VNF ID

-    description: The VNF ID is provided by ONAP

-  vf_module_id:

-    type: string

-    label: vFirewall module ID

-    description: The vFirewall 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

-

-  unprotected_private_network:

-    type: OS::Neutron::Net

-    properties:

-      name: { get_param: unprotected_private_net_id }

-

-  unprotected_private_subnet:

-    type: OS::Neutron::Subnet

-    properties:

-      name: { get_param: unprotected_private_subnet_id }

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

-      name: { get_param: protected_private_subnet_id }

-      network_id: { get_resource: protected_private_network }

-      cidr: { get_param: protected_private_net_cidr }

-

-  # Virtual Firewall instantiation

-  vfw_private_0_port:

-    type: OS::Neutron::Port

-    properties:

-      network: { get_resource: unprotected_private_network }

-      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]

-

-  vfw_private_1_port:

-    type: OS::Neutron::Port

-    properties:

-      allowed_address_pairs: [{ "ip_address": { get_param: vpg_private_ip_0 }}]

-      network: { get_resource: protected_private_network }

-      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]

-

-  vfw_private_2_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: vfw_private_ip_2 }}]

-

-  vfw_0:

-    type: OS::Nova::Server

-    properties:

-      image: { get_param: image_name }

-      flavor: { get_param: flavor_name }

-      name: { get_param: vfw_name_0 }

-      key_name: { get_resource: my_keypair }

-      networks:

-        - network: { get_param: public_net_id }

-        - port: { get_resource: vfw_private_0_port }

-        - port: { get_resource: vfw_private_1_port }

-        - port: { get_resource: vfw_private_2_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:

-            __dcae_collector_ip__ : { get_param: dcae_collector_ip }

-            __dcae_collector_port__ : { get_param: dcae_collector_port }

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

-            __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }

-            __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }

-            __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }

-            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }

-            __protected_private_net_cidr__ : { get_param: protected_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 "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt

-            echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.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 "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt

-            echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt

-            echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt

-            echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt

-            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

-            chmod +x v_firewall_install.sh

-            ./v_firewall_install.sh

-

-

-  # Virtual Sink instantiation

-  vsn_private_0_port:

-    type: OS::Neutron::Port

-    properties:

-      network: { get_resource: protected_private_network }

-      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]

-

-  vsn_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: vsn_private_ip_1 }}]

-

-  vsn_0:

-    type: OS::Nova::Server

-    properties:

-      image: { get_param: image_name }

-      flavor: { get_param: flavor_name }

-      name: { get_param: vsn_name_0 }

-      key_name: { get_resource: my_keypair }

-      networks:

-        - network: { get_param: public_net_id }

-        - port: { get_resource: vsn_private_0_port }

-        - port: { get_resource: vsn_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:

-            __protected_net_gw__: { get_param: vfw_private_ip_1 }

-            __unprotected_net__: { get_param: unprotected_private_net_cidr }

-            __repo_url_blob__ : { get_param: repo_url_blob }

-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }

-            __install_script_version__ : { get_param: install_script_version }

-            __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }

-            __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }

-            __protected_private_net_cidr__ : { get_param: protected_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 "__protected_net_gw__" > /opt/config/protected_net_gw.txt

-            echo "__unprotected_net__" > /opt/config/unprotected_net.txt

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

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

-            echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt

-            echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt

-            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

-            chmod +x v_sink_install.sh

-            ./v_sink_install.sh

+##########################################################################
+#
+#==================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 Closed Loop demo app (vFW and vSink) for ONAP
+
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
+parameters:
+  image_name:
+    type: string
+    label: Image name or ID
+    description: Image to be used for compute instance
+  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_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 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
+    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
+  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
+  vfw_private_ip_1:
+    type: string
+    label: vFirewall private IP address towards the protected network
+    description: Private IP address that is assigned to the vFirewall to communicate with the vSink
+  vfw_private_ip_2:
+    type: string
+    label: vFirewall private IP address towards the ONAP management network
+    description: Private IP address that is assigned to the vFirewall to communicate with ONAP components
+  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
+  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
+  vsn_private_ip_1:
+    type: string
+    label: vSink private IP address towards the ONAP management network
+    description: Private IP address that is assigned to the vSink to communicate with ONAP components
+  vfw_name_0:
+    type: string
+    label: vFirewall name
+    description: Name of the vFirewall
+  vsn_name_0:
+    type: string
+    label: vSink name
+    description: Name of the vSink
+  vnf_id:
+    type: string
+    label: VNF ID
+    description: The VNF ID is provided by ONAP
+  vf_module_id:
+    type: string
+    label: vFirewall module ID
+    description: The vFirewall 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
+
+  unprotected_private_network:
+    type: OS::Neutron::Net
+    properties:
+      name: { get_param: unprotected_private_net_id }
+
+  unprotected_private_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name: { get_param: unprotected_private_subnet_id }
+      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:
+      name: { get_param: protected_private_subnet_id }
+      network_id: { get_resource: protected_private_network }
+      cidr: { get_param: protected_private_net_cidr }
+
+  # Virtual Firewall instantiation
+  vfw_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: unprotected_private_network }
+      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]
+
+  vfw_private_1_port:
+    type: OS::Neutron::Port
+    properties:
+      allowed_address_pairs: [{ "ip_address": { get_param: vpg_private_ip_0 }}]
+      network: { get_resource: protected_private_network }
+      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]
+
+  vfw_private_2_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: vfw_private_ip_2 }}]
+
+  vfw_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: image_name }
+      flavor: { get_param: flavor_name }
+      name: { get_param: vfw_name_0 }
+      key_name: { get_resource: my_keypair }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vfw_private_0_port }
+        - port: { get_resource: vfw_private_1_port }
+        - port: { get_resource: vfw_private_2_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:
+            __dcae_collector_ip__ : { get_param: dcae_collector_ip }
+            __dcae_collector_port__ : { get_param: dcae_collector_port }
+            __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 }
+            __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }
+            __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }
+            __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }
+            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }
+            __protected_private_net_cidr__ : { get_param: protected_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 "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
+            echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.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 "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt
+            echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt
+            echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt
+            echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt
+            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
+            chmod +x v_firewall_install.sh
+            ./v_firewall_install.sh
+
+
+  # Virtual Sink instantiation
+  vsn_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: protected_private_network }
+      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]
+
+  vsn_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: vsn_private_ip_1 }}]
+
+  vsn_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: image_name }
+      flavor: { get_param: flavor_name }
+      name: { get_param: vsn_name_0 }
+      key_name: { get_resource: my_keypair }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vsn_private_0_port }
+        - port: { get_resource: vsn_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:
+            __protected_net_gw__: { get_param: vfw_private_ip_1 }
+            __unprotected_net__: { get_param: unprotected_private_net_cidr }
+            __repo_url_blob__ : { get_param: repo_url_blob }
+            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
+            __install_script_version__ : { get_param: install_script_version }
+            __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
+            __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }
+            __protected_private_net_cidr__ : { get_param: protected_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 "__protected_net_gw__" > /opt/config/protected_net_gw.txt
+            echo "__unprotected_net__" > /opt/config/unprotected_net.txt
+            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
+            echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt
+            echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt
+            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
+            chmod +x v_sink_install.sh
+            ./v_sink_install.sh
diff --git a/heat/vFWCL/vPKG/base_vpkg.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml
index 79d35bd3..160331bf 100644
--- a/heat/vFWCL/vPKG/base_vpkg.yaml
+++ b/heat/vFWCL/vPKG/base_vpkg.yaml
@@ -1,221 +1,221 @@
-##########################################################################

-#

-#==================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 the vFirewall Traffic Generator demo app for ONAP

-

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

-#            #

-# PARAMETERS #

-#            #

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

-

-parameters:

-  image_name:

-    type: string

-    label: Image name or ID

-    description: Image to be used for compute instance

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

-    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

-  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

-  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

-  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_net_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: image_name }

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

+##########################################################################
+#
+#==================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 the vFirewall Traffic Generator demo app for ONAP
+
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
+parameters:
+  image_name:
+    type: string
+    label: Image name or ID
+    description: Image to be used for compute instance
+  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_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 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
+    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
+  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
+  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
+  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_net_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: image_name }
+      flavor: { get_param: 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
diff --git a/tutorials/Clearwater_vIMS/sdnc/preload_vnf_topology_clearwater.json b/tutorials/Clearwater_vIMS/sdnc/preload_vnf_topology_clearwater.json
index f5bb11f9..9b6aa578 100644
--- a/tutorials/Clearwater_vIMS/sdnc/preload_vnf_topology_clearwater.json
+++ b/tutorials/Clearwater_vIMS/sdnc/preload_vnf_topology_clearwater.json
@@ -1,47 +1,47 @@
-{

-  "input":

-  {

-    "request-information":

-    {

-      "notification-url":"openecomp.org",

-      "order-number":"1",

-      "order-version":"1",

-      "request-action":"PreloadVNFRequest",

-      "request-id": "robot20"

-    },

-    "sdnc-request-header":

-    {

-      "svc-action": "reserve",

-      "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify",

-      "svc-request-id":"robot20"

-    },

-    "vnf-topology-information":

-    {

-      "vnf-assignments":

-      {

-        "availability-zones":[],

-        "vnf-networks":[],

-        "vnf-vms":[]

-      },

-      "vnf-parameters":

-      [

-        {"vnf-parameter-name":"public_net_id","vnf-parameter-value": "00000000-0000-0000-0000-000000000000"},

-        {"vnf-parameter-name":"key_name","vnf-parameter-value":"cw-key"},

-        {"vnf-parameter-name":"pub_key","vnf-parameter-value":"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN imported-openssh-key"},

-        {"vnf-parameter-name":"repo_url","vnf-parameter-value":"http://repo.cw-ngv.com/stable"},

-        {"vnf-parameter-name":"zone","vnf-parameter-value":"vimstest.onap.org"},

-        {"vnf-parameter-name":"dn_range_start","vnf-parameter-value":"5555551000"},

-        {"vnf-parameter-name":"dn_range_length","vnf-parameter-value":"20"},

-        {"vnf-parameter-name":"dnssec_key","vnf-parameter-value":"9FPdYTWhk5+LbhrqtTPQKw=="}

-      ],

-      "vnf-topology-identifier":

-      {

-        "generic-vnf-name":"vIMSVNFTEST1",

-        "generic-vnf-type":"vIMS_Clearwater 1",

-        "service-type":"1e736900-db02-4bd2-9e7b-72ac1a08c3f7",

-        "vnf-name":"vIMSVNFTEST1",

-        "vnf-type":"VimsClearwater..base_clearwater..module-0"

-      }

-    }

-  }

-}

+{
+  "input":
+  {
+    "request-information":
+    {
+      "notification-url":"openecomp.org",
+      "order-number":"1",
+      "order-version":"1",
+      "request-action":"PreloadVNFRequest",
+      "request-id": "robot20"
+    },
+    "sdnc-request-header":
+    {
+      "svc-action": "reserve",
+      "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify",
+      "svc-request-id":"robot20"
+    },
+    "vnf-topology-information":
+    {
+      "vnf-assignments":
+      {
+        "availability-zones":[],
+        "vnf-networks":[],
+        "vnf-vms":[]
+      },
+      "vnf-parameters":
+      [
+        {"vnf-parameter-name":"public_net_id","vnf-parameter-value": "00000000-0000-0000-0000-000000000000"},
+        {"vnf-parameter-name":"key_name","vnf-parameter-value":"cw-key"},
+        {"vnf-parameter-name":"pub_key","vnf-parameter-value":"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN imported-openssh-key"},
+        {"vnf-parameter-name":"repo_url","vnf-parameter-value":"http://repo.cw-ngv.com/stable"},
+        {"vnf-parameter-name":"zone","vnf-parameter-value":"vimstest.onap.org"},
+        {"vnf-parameter-name":"dn_range_start","vnf-parameter-value":"5555551000"},
+        {"vnf-parameter-name":"dn_range_length","vnf-parameter-value":"20"},
+        {"vnf-parameter-name":"dnssec_key","vnf-parameter-value":"9FPdYTWhk5+LbhrqtTPQKw=="}
+      ],
+      "vnf-topology-identifier":
+      {
+        "generic-vnf-name":"vIMSVNFTEST1",
+        "generic-vnf-type":"vIMS_Clearwater 1",
+        "service-type":"1e736900-db02-4bd2-9e7b-72ac1a08c3f7",
+        "vnf-name":"vIMSVNFTEST1",
+        "vnf-type":"VimsClearwater..base_clearwater..module-0"
+      }
+    }
+  }
+}
diff --git a/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/images/architecture.png b/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/images/architecture.png
index 98adb318..5ca909ed 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/images/architecture.png
+++ b/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/images/architecture.png