Refactor vCPE vBRG and vBNG image creation process

[demo.git] / heat / vCPE / vbrgemu / base_vcpe_vbrgemu.yaml

diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index 0af21ef..2297034 100644 (file)
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
@@ -78,8 +78,8 @@ parameters:
   #  description: Private IP address towards the BRGEMU private network
   vbrgemu_name_0:
     type: string
-    label: vGW  name
-    description: Name of the vGW
+    label: vBRG name
+    description: Name of the vBRG
   vnf_id:
     type: string
     label: VNF ID
@@ -100,7 +100,7 @@ parameters:
     type: string
     label: Repository URL
     description: URL of the repository that hosts the demo packages
-  install_script_version:
+  script_version:
     type: string
     label: Installation script version number
     description: Version number of the scripts that install the vFW demo app
@@ -116,26 +116,6 @@ parameters:
     type: string
     label: Cloud environment
     description: Cloud environment (e.g., openstack, rackspace)
-  vpp_source_repo_url:
-    type: string
-    label: VPP Source Git Repo
-    description: URL for VPP source codes
-  vpp_source_repo_release_tag:
-    type: string
-    label: VPP Source Git Release Tag
-    description: Git Release Tag for the VPP source codes
-  hc2vpp_source_repo_url:
-    type: string
-    label: Honeycomb Source Git Repo
-    description: URL for Honeycomb source codes
-  hc2vpp_source_repo_release_tag:
-    type: string
-    label: Honeycomb Source Git Release Tag
-    description: Git Release Tag for the Honeycomb source codes
-  vpp_patch_url:
-    type: string
-    label: VPP Patch URL
-    description: URL for VPP patch for vBRG Emulator
   sdnc_ip:
     type: string
     label: SDNC ip address
@@ -143,8 +123,7 @@ parameters:
   compile_state:
     type: string
     label: Compile State
-    description: State to compile code or not
-
+    description: State to compile code or not; included for backwards compatibility
 
 #############
 #           #
@@ -189,7 +168,7 @@ resources:
     type: OS::Neutron::Port
     properties:
       network: { get_param: vbrgemu_bng_private_net_id }
-      fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }}]
+   #    fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }}]
   ##    fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}]
 
   #vbrgemu_private_1_port:
@@ -219,13 +198,8 @@ resources:
             __brgemu_bng_private_net_cidr__: { get_param: vbrgemu_bng_private_net_cidr }
             __repo_url_artifacts__ : { get_param: repo_url_artifacts }
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
+            __script_version__ : { get_param: script_version }
             __cloud_env__ : { get_param: cloud_env }
-            __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }
-            __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag }
-            __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }
-            __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag }
-            __vpp_patch_url__ : { get_param: vpp_patch_url }
             __sdnc_ip__ : { get_param: sdnc_ip }
             __compile_state__ : { get_param: compile_state }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
@@ -239,22 +213,17 @@ resources:
             echo "__brgemu_bng_private_net_cidr__" > /opt/config/brgemu_bng_private_net_cidr.txt
             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 "__script_version__" > /opt/config/script_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt
-            echo "__vpp_source_repo_release_tag__" > /opt/config/vpp_source_repo_release_tag.txt
-            echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt
-            echo "__hc2vpp_source_repo_release_tag__" > /opt/config/hc2vpp_source_repo_release_tag.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
             echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
 
             # Download and run install script
             apt-get -y install unzip
-            if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__install_script_version__.zip
-            unzip -j /opt/vcpe-scripts-__install_script_version__.zip -d /opt v_brgemu_install.sh
+            if [[ "__script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__script_version__" -o /opt/vcpe-scripts-__script_version__.zip
+            unzip -j /opt/vcpe-scripts-__script_version__.zip -d /opt v_brgemu_install.sh
             cd /opt
             chmod +x v_brgemu_install.sh
             ./v_brgemu_install.sh