Cleanup vFW/vPacketGen templates for closed loop

[demo.git] / heat / vFWCL / vFWSNK / base_vfw.yaml

diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml
index 514de34..c82e2e5 100644 (file)
--- a/heat/vFWCL/vFWSNK/base_vfw.yaml
+++ b/heat/vFWCL/vFWSNK/base_vfw.yaml
@@ -1,7 +1,7 @@
 ##########################################################################\r
 #\r
 #==================LICENSE_START==========================================\r
-# \r
+#\r
 #\r
 # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.\r
 #\r
@@ -24,7 +24,7 @@
 \r
 heat_template_version: 2013-05-23\r
 \r
-description: Heat template that deploys vFirewall Closed Loop demo app (FW and Sink) for ONAP\r
+description: Heat template that deploys vFirewall Closed Loop demo app (vFW and vSink) for ONAP\r
 \r
 ##############\r
 #            #\r
@@ -33,11 +33,11 @@ description: Heat template that deploys vFirewall Closed Loop demo app (FW and S
 ##############\r
 \r
 parameters:\r
-  vfw_image_name:\r
+  image_name:\r
     type: string\r
     label: Image name or ID\r
     description: Image to be used for compute instance\r
-  vfw_flavor_name:\r
+  flavor_name:\r
     type: string\r
     label: Flavor\r
     description: Type of instance (flavor) to be used\r
@@ -49,10 +49,26 @@ parameters:
     type: string\r
     label: Unprotected private network name or ID\r
     description: Private network that connects vPacketGenerator with vFirewall\r
+  unprotected_private_subnet_id:\r
+    type: string\r
+    label: Unprotected private subnetwork name or ID\r
+    description: Private subnetwork of the protected network\r
+  unprotected_private_net_cidr:\r
+    type: string\r
+    label: Unprotected private network CIDR\r
+    description: The CIDR of the unprotected private network\r
   protected_private_net_id:\r
     type: string\r
     label: Protected private network name or ID\r
     description: Private network that connects vFirewall with vSink\r
+  protected_private_subnet_id:\r
+    type: string\r
+    label: Protected private subnetwork name or ID\r
+    description: Private subnetwork of the unprotected network\r
+  protected_private_net_cidr:\r
+    type: string\r
+    label: Protected private network CIDR\r
+    description: The CIDR of the protected private network\r
   onap_private_net_id:\r
     type: string\r
     label: ONAP management network name or ID\r
@@ -61,14 +77,6 @@ parameters:
     type: string\r
     label: ONAP management sub-network name or ID\r
     description: Private sub-network that connects ONAP components and the VNF\r
-  unprotected_private_net_cidr:\r
-    type: string\r
-    label: Unprotected private network CIDR\r
-    description: The CIDR of the unprotected private network\r
-  protected_private_net_cidr:\r
-    type: string\r
-    label: Protected private network CIDR\r
-    description: The CIDR of the protected private network\r
   onap_private_net_cidr:\r
     type: string\r
     label: ONAP private network CIDR\r
@@ -179,11 +187,6 @@ resources:
     properties:\r
       name: { get_param: unprotected_private_net_id }\r
 \r
-  protected_private_network:\r
-    type: OS::Neutron::Net\r
-    properties:\r
-      name: { get_param: protected_private_net_id }\r
-\r
   unprotected_private_subnet:\r
     type: OS::Neutron::Subnet\r
     properties:\r
@@ -191,6 +194,11 @@ resources:
       network_id: { get_resource: unprotected_private_network }\r
       cidr: { get_param: unprotected_private_net_cidr }\r
 \r
+  protected_private_network:\r
+    type: OS::Neutron::Net\r
+    properties:\r
+      name: { get_param: protected_private_net_id }\r
+\r
   protected_private_subnet:\r
     type: OS::Neutron::Subnet\r
     properties:\r
@@ -221,8 +229,8 @@ resources:
   vfw_0:\r
     type: OS::Nova::Server\r
     properties:\r
-      image: { get_param: vfw_image_name }\r
-      flavor: { get_param: vfw_flavor_name }\r
+      image: { get_param: image_name }\r
+      flavor: { get_param: flavor_name }\r
       name: { get_param: vfw_name_0 }\r
       key_name: { get_resource: my_keypair }\r
       networks:\r
@@ -250,7 +258,7 @@ resources:
             __cloud_env__ : { get_param: cloud_env }\r
           template: |\r
             #!/bin/bash\r
-            \r
+\r
             # Create configuration files\r
             mkdir /opt/config\r
             echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt\r
@@ -266,7 +274,7 @@ resources:
             echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt\r
             echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt\r
             echo "__cloud_env__" > /opt/config/cloud_env.txt\r
-            \r
+\r
             # Download and run install script\r
             curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh\r
             cd /opt\r
@@ -290,8 +298,8 @@ resources:
   vsn_0:\r
     type: OS::Nova::Server\r
     properties:\r
-      image: { get_param: vfw_image_name }\r
-      flavor: { get_param: vfw_flavor_name }\r
+      image: { get_param: image_name }\r
+      flavor: { get_param: flavor_name }\r
       name: { get_param: vsn_name_0 }\r
       key_name: { get_resource: my_keypair }\r
       networks:\r
@@ -315,7 +323,7 @@ resources:
             __cloud_env__ : { get_param: cloud_env }\r
           template: |\r
             #!/bin/bash\r
-            \r
+\r
             # Create configuration files\r
             mkdir /opt/config\r
             echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt\r
@@ -327,7 +335,7 @@ resources:
             echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt\r
             echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt\r
             echo "__cloud_env__" > /opt/config/cloud_env.txt\r
-            \r
+\r
             # Download and run install script\r
             curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh\r
             cd /opt\r