7 files changed, 180 insertions, 7 deletions

diff --git a/heat/vFW/base_vfw_openstack.yaml b/heat/vFW/base_vfw_openstack.yaml
index 27ebb22b..6ef33cca 100644
--- a/heat/vFW/base_vfw_openstack.yaml
+++ b/heat/vFW/base_vfw_openstack.yaml
@@ -1,7 +1,37 @@
+##########################################################################

+#

+#==================LICENSE_START==========================================

+# 

+#

+# Copyright © 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

@@ -128,6 +158,12 @@ parameters:
     label: Cloud environment

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

 

+#############

+#           #

+# RESOURCES #

+#           #

+#############

+

 resources:

   random-str:

     type: OS::Heat::RandomString

diff --git a/heat/vFW/base_vfw_rackspace.yaml b/heat/vFW/base_vfw_rackspace.yaml
index 868ebc38..01d6c441 100644
--- a/heat/vFW/base_vfw_rackspace.yaml
+++ b/heat/vFW/base_vfw_rackspace.yaml
@@ -1,7 +1,37 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+# 
+#
+# Copyright © 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
@@ -128,6 +158,12 @@ parameters:
     label: Cloud environment
     description: Cloud environment (e.g., openstack, rackspace)
 
+#############
+#           #
+# RESOURCES #
+#           #
+#############
+
 resources:
   random-str:
     type: OS::Heat::RandomString
diff --git a/heat/vLB/.DS_Store b/heat/vLB/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/heat/vLB/.DS_Store
+++ /dev/null
diff --git a/heat/vLB/base_vlb_rackspace.yaml b/heat/vLB/base_vlb_rackspace.yaml
index f32bd29b..0bd138be 100644
--- a/heat/vLB/base_vlb_rackspace.yaml
+++ b/heat/vLB/base_vlb_rackspace.yaml
@@ -1,7 +1,37 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+# 
+#
+# Copyright © 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 to deploy vLoadBalancer/vDNS demo app for ONAP
 
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
 parameters:
   vlb_image_name:
     type: string
@@ -104,6 +134,12 @@ parameters:
     label: Cloud environment
     description: Cloud environment (e.g., openstack, rackspace)
 
+#############
+#           #
+# RESOURCES #
+#           #
+#############
+
 resources:
 
   random-str:
diff --git a/heat/vLB/dnsscaling_rackspace.yaml b/heat/vLB/dnsscaling_rackspace.yaml
index 966a5155..c2043dd5 100644
--- a/heat/vLB/dnsscaling_rackspace.yaml
+++ b/heat/vLB/dnsscaling_rackspace.yaml
@@ -1,7 +1,37 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+# 
+#
+# Copyright © 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 to deploy a vDNS for ONAP (scaling-up scenario)
 
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
 parameters:
   vlb_image_name:
     type: string
@@ -84,6 +114,12 @@ parameters:
     label: Cloud environment
     description: Cloud environment (e.g., openstack, rackspace)
 
+#############
+#           #
+# RESOURCES #
+#           #
+#############
+
 resources:
 
   random-str:
diff --git a/heat/vLB/packet_gen_vlb_rackspace.env b/heat/vLB/packet_gen_vlb_rackspace.env
index 43d7dca7..91002fed 100644
--- a/heat/vLB/packet_gen_vlb_rackspace.env
+++ b/heat/vLB/packet_gen_vlb_rackspace.env
@@ -10,4 +10,3 @@ parameters:
   install_script_version: 1.1.0-SNAPSHOT
   key_name: dns_packetgen_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
-  cloud_env: rackspace
diff --git a/heat/vLB/packet_gen_vlb_rackspace.yaml b/heat/vLB/packet_gen_vlb_rackspace.yaml
index 94776fc6..fea9a770 100644
--- a/heat/vLB/packet_gen_vlb_rackspace.yaml
+++ b/heat/vLB/packet_gen_vlb_rackspace.yaml
@@ -1,6 +1,37 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+# 
+#
+# Copyright © 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 to deploy a packet generator for the vLoadBalancer/vDNS demo app for ONAP
 
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
 parameters:
   public_net_id:
     type: string
@@ -46,11 +77,12 @@ parameters:
     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:
 
@@ -90,7 +122,6 @@ resources:
             __vlb_ipaddr__: { get_param: vlb_ipaddr }
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }
             __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
           template: |
             #!/bin/bash
 
@@ -101,7 +132,6 @@ resources:
             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 "__cloud_env__" > /opt/config/cloud_env.txt
 
             # Download and run install script
             curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh