X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFWCL%2FvPKG%2Fbase_vpkg.yaml;fp=heat%2FvFWCL%2FvPNG%2Fbase_vpng.yaml;h=79d35bd3b656b9a177bdc88e6f5c265304f0dfab;hb=d68f408326e682a276835f4906fd615413110e4c;hp=7243f106b6f784956eeb98670ff29fa04b6c6efe;hpb=848eded4aa7fc37a72a4677d1f075852cc826a89;p=demo.git

diff --git a/heat/vFWCL/vPNG/base_vpng.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml
similarity index 90%
rename from heat/vFWCL/vPNG/base_vpng.yaml
rename to heat/vFWCL/vPKG/base_vpkg.yaml
index 7243f106..79d35bd3 100644
--- a/heat/vFWCL/vPNG/base_vpng.yaml
+++ b/heat/vFWCL/vPKG/base_vpkg.yaml
@@ -1,7 +1,7 @@
 ##########################################################################
 #
 #==================LICENSE_START==========================================
-# 
+#
 #
 # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
 #
@@ -24,7 +24,7 @@
 
 heat_template_version: 2013-05-23
 
-description: Heat template that deploys vFirewall Traffic Generator demo app for ONAP
+description: Heat template that deploys the vFirewall Traffic Generator demo app for ONAP
 
 ##############
 #            #
@@ -33,11 +33,11 @@ description: Heat template that deploys vFirewall Traffic Generator demo app for
 ##############
 
 parameters:
-  vfw_image_name:
+  image_name:
     type: string
     label: Image name or ID
     description: Image to be used for compute instance
-  vfw_flavor_name:
+  flavor_name:
     type: string
     label: Flavor
     description: Type of instance (flavor) to be used
@@ -45,14 +45,22 @@ parameters:
     type: string
     label: Public network name or ID
     description: Public network that enables remote connection to VNF
-  unprotected_private_network_id:
+  unprotected_private_net_id:
     type: string
     label: Unprotected private network name or ID
     description: Private network that connects vPacketGenerator with vFirewall
   unprotected_private_subnet_id:
     type: string
     label: Unprotected private sub-network name or ID
-    description: Private sub-network that connects vPacketGenerator with vFirewall
+    description: Private subnetwork for the unprotected network
+  unprotected_private_net_cidr:
+    type: string
+    label: Unprotected private network CIDR
+    description: The CIDR of the unprotected private network
+  protected_private_net_cidr:
+    type: string
+    label: Protected private network CIDR
+    description: The CIDR of the protected private network
   onap_private_net_id:
     type: string
     label: ONAP management network name or ID
@@ -61,30 +69,18 @@ parameters:
     type: string
     label: ONAP management sub-network name or ID
     description: Private sub-network that connects ONAP components and the VNF
-  unprotected_private_net_cidr:
-    type: string
-    label: Unprotected private network CIDR
-    description: The CIDR of the unprotected private network
   onap_private_net_cidr:
     type: string
     label: ONAP private network CIDR
     description: The CIDR of the protected private network
-
   vfw_private_ip_0:
     type: string
     label: vFirewall private IP address towards the unprotected network
     description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator
-
-  protected_private_net_cidr:
-    type: string
-    label: Protected private network CIDR
-    description: The CIDR of the protected private network
-
   vsn_private_ip_0:
     type: string
     label: vSink private IP address towards the protected network
     description: Private IP address that is assigned to the vSink to communicate with the vFirewall
-
   vpg_private_ip_0:
     type: string
     label: vPacketGenerator private IP address towards the unprotected network
@@ -105,14 +101,6 @@ parameters:
     type: string
     label: vPNG Traffic Generator module ID
     description: The vPNG Module ID is provided by ONAP
-  dcae_collector_ip:
-    type: string
-    label: DCAE collector IP address
-    description: IP address of the DCAE collector
-  dcae_collector_port:
-    type: string
-    label: DCAE collector port
-    description: Port of the DCAE collector
   key_name:
     type: string
     label: Key pair name
@@ -171,7 +159,7 @@ resources:
   vpg_private_0_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_param: unprotected_private_network_id }
+      network: { get_param: unprotected_private_net_id }
       fixed_ips: [{"subnet": { get_param: unprotected_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_0 }}]
 
   vpg_private_1_port:
@@ -183,8 +171,8 @@ resources:
   vpg_0:
     type: OS::Nova::Server
     properties:
-      image: { get_param: vfw_image_name }
-      flavor: { get_param: vfw_flavor_name }
+      image: { get_param: image_name }
+      flavor: { get_param: flavor_name }
       name: { get_param: vpg_name_0 }
       key_name: { get_resource: my_keypair }
       networks:
@@ -210,7 +198,7 @@ resources:
             __cloud_env__ : { get_param: cloud_env }
           template: |
             #!/bin/bash
-            
+
             # Create configuration files
             mkdir /opt/config
             echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt
@@ -225,7 +213,7 @@ resources:
             echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt
             echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
-            
+
             # Download and run install script
             curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
             cd /opt