Included compile state in vbrg env and yaml files

Modified vbrg env file to include compile state
Modified vbrg yaml file to pick compile state and
automatically create /opt/config/compile_state.txt

Change-Id: Ic49568142eedbd1a5f483c6d06424be864b52c0e
Issue-ID: INT-63
Signed-off-by: Itohan <itohan.ukponmwan@intel.com>

diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index ef49dcf..7719f55 100644 (file)
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -1,6 +1,7 @@
  parameters:
-  vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)
+  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: PUT THE COMPILE STATE (done, auto or build)
   public_net_id: PUT THE PUBLIC NETWORK ID HERE
   vbrgemu_bng_private_net_id: zdfw1bngin01_private
   vbrgemu_bng_private_subnet_id: zdfw1bngin01_sub_private
@@ -18,7 +19,7 @@
   demo_artifacts_version: 1.1.0
   install_script_version: 1.1.0-SNAPSHOT
   key_name: vbrgemu_key
-  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
+  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh
   cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
   vpp_source_repo_url: https://gerrit.fd.io/r/vpp
   vpp_source_repo_branch: stable/1704

diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index 192dfbf..a786995 100644 (file)
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
@@ -59,10 +59,10 @@ parameters:
     type: string
     label: vBNG IN private network CIDR
     description: The CIDR of the input side of vBNG private network
-  #vbrgemu_private_net_id:
-  #  type: string
-  #  label: vBRGEMU Home private network name or ID
-  #  description: Private network that connects vBRGEMU to local devices
+ # vbrgemu_private_net_id:
+ #   type: string
+ #   label: vBRGEMU Home private network name or ID
+ #   description: Private network that connects vBRGEMU to local devices
   #vbrgemu_private_net_cidr:
   #  type: string
   #  label: vBRGEMU Home private network CIDR
@@ -138,8 +138,11 @@ parameters:
   sdnc_ip:
     type: string
     label: SDNC ip address
-    description: SDNC ip address uesd to set NAT
-
+    description: SDNC ip address used to set NAT
+  compile_state:
+    type: string
+    label: Compile State
+    description: State to compile code or not
 #############
 #           #
 # RESOURCES #
@@ -201,7 +204,7 @@ resources:
       networks:
         - network: { get_param: public_net_id }
         - port: { get_resource: vbrgemu_private_0_port }
-      #  - port: { get_resource: vbrgemu_private_1_port }
+        #- port: { get_resource: vbrgemu_private_1_port }
       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
@@ -221,6 +224,7 @@ resources:
             __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch }
             __vpp_patch_url__ : { get_param: vpp_patch_url }
             __sdnc_ip__ : { get_param: sdnc_ip }
+            __compile_state__ : { get_param: compile_state }
           template: |
             #!/bin/bash
 
@@ -240,6 +244,7 @@ resources:
             echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt
             echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt
             echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt
+            echo "__compile_state__" > /opt/config/compile_state.txt
 
             # Download and run install script
             curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_brgemu_install.sh -o /opt/v_brgemu_install.sh