Update VBRG, vBNG compatibility w/ prev templates

The VNF heat templates and environment files for the Casablanca release
provide backwards compatibility with previous releases. In the build
heat template of each VNF, the compile_state parameter is included
with a default state of ‘done’ specified.

This change removes the compile_state parameter from .env and .yaml files
where it was not necessary in order to maintain consistency with the way
that backwards compatibility is provided in vG-MUX and vGW templates.

Issue-ID: INT-615

Change-Id: I6317f20a94c374d30edc019dfe36f0c28bca4830
Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>

diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env
index 6d860ad..a29fe63 100644 (file)
--- a/heat/vCPE/vbng/base_vcpe_vbng.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng.env
@@ -1,7 +1,6 @@
  parameters:
   vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)
   vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)
-  compile_state: done
   public_net_id: PUT THE PUBLIC NETWORK ID HERE
   brgemu_bng_private_net_id: zdfw1bngin01_private
   brgemu_bng_private_subnet_id: zdfw1bngin01_sub_private

diff --git a/heat/vCPE/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml
index 997e4c2..fbdbf8f 100644 (file)
--- a/heat/vCPE/vbng/base_vcpe_vbng.yaml
+++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml
@@ -161,10 +161,6 @@ parameters:
     type: string
     label: SDNC IP address
     description: IP address of the SDNC
-  compile_state:
-    type: string
-    label: Compile State
-    description: State to compile code or not; included for backwards compatibility
 
 #############
 #           #
@@ -250,7 +246,6 @@ resources:
             __script_version__ : { get_param: script_version }
             __cloud_env__ : { get_param: cloud_env }
             __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-            __compile_state__ : { get_param: compile_state }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
             #!/bin/bash
@@ -272,7 +267,6 @@ resources:
             echo "__script_version__" > /opt/config/script_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
-            echo "__compile_state__" > /opt/config/compile_state.txt
             echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
 
             # Download and run install script

diff --git a/heat/vCPE/vbng/build_vcpe_vbng.env b/heat/vCPE/vbng/build_vcpe_vbng.env
index b7e2de0..ba9a2c4 100644 (file)
--- a/heat/vCPE/vbng/build_vcpe_vbng.env
+++ b/heat/vCPE/vbng/build_vcpe_vbng.env
@@ -1,7 +1,6 @@
  parameters:
   vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)
   vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)
-  compile_state: build
   public_net_id: PUT THE PUBLIC NETWORK ID HERE
   vbng_name_0: zdcpe1cpe01bng01
   vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app

diff --git a/heat/vCPE/vbng/build_vcpe_vbng.yaml b/heat/vCPE/vbng/build_vcpe_vbng.yaml
index eb623f8..59cc291 100644 (file)
--- a/heat/vCPE/vbng/build_vcpe_vbng.yaml
+++ b/heat/vCPE/vbng/build_vcpe_vbng.yaml
@@ -101,6 +101,7 @@ parameters:
     type: string
     label: Compile State
     description: State to compile code or not; included for backwards compatibility
+    default: "done"
 
 #############
 #           #

diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index ce29647..41b5bfc 100644 (file)
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -1,7 +1,6 @@
  parameters:
   vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 or vbrg-base-ubuntu-16-04 SUGGESTED)
   vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)
-  compile_state: done
   public_net_id: PUT THE PUBLIC NETWORK ID HERE
   vbrgemu_bng_private_net_id: zdfw1bngin01_private
   vbrgemu_bng_private_subnet_id: zdfw1bngin01_sub_private

diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index 2297034..e0b6da4 100644 (file)
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
@@ -120,10 +120,6 @@ parameters:
     type: string
     label: SDNC ip address
     description: SDNC ip address used to set NAT
-  compile_state:
-    type: string
-    label: Compile State
-    description: State to compile code or not; included for backwards compatibility
 
 #############
 #           #
@@ -201,7 +197,6 @@ resources:
             __script_version__ : { get_param: script_version }
             __cloud_env__ : { get_param: cloud_env }
             __sdnc_ip__ : { get_param: sdnc_ip }
-            __compile_state__ : { get_param: compile_state }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
             #!/bin/bash
@@ -216,7 +211,6 @@ resources:
             echo "__script_version__" > /opt/config/script_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt
-            echo "__compile_state__" > /opt/config/compile_state.txt
             echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
 
             # Download and run install script

diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env
index 4c9ae43..15035a6 100644 (file)
--- a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env
@@ -1,7 +1,6 @@
  parameters:
   vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 or vbrg-base-ubuntu-16-04 SUGGESTED)
   vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)
-  compile_state: build
   vbrgemu_name_0: zdcpe1cpe01brgemu01
   vnf_id: vCPE_Infrastructure_BGREMU_demo_app
   vf_module_id: vCPE_Customer_BRGEMU

diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml
index c5a3332..e176747 100644 (file)
--- a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml
+++ b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml
@@ -111,6 +111,7 @@ parameters:
     type: string
     label: Compile State
     description: State to compile code or not; included for backwards compatibility
+    default: "done"
     
 #############
 #           #