aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vCPE/vbrgemu
diff options
context:
space:
mode:
Diffstat (limited to 'heat/vCPE/vbrgemu')
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env9
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml51
-rw-r--r--heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env18
-rw-r--r--heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml189
4 files changed, 219 insertions, 48 deletions
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index 052d12e0..ce29647b 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -1,7 +1,7 @@
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: PUT THE COMPILE STATE (done, auto or build)
+ 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
@@ -16,12 +16,7 @@
vf_module_id: vCPE_Customer_BRGEMU
repo_url_artifacts: https://nexus.onap.org/content/repositories/staging
demo_artifacts_version: 1.3.0
- install_script_version: 1.3.0-SNAPSHOT
+ script_version: 1.3.0-SNAPSHOT
key_name: vbrgemu_key
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_release_tag: v17.04
- hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp
- hc2vpp_source_repo_release_tag: v1.17.04
- vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index 0af21ef7..22970344 100644
--- 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
diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env
new file mode 100644
index 00000000..4c9ae439
--- /dev/null
+++ b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env
@@ -0,0 +1,18 @@
+ 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
+ repo_url_artifacts: https://nexus.onap.org/content/repositories/staging
+ demo_artifacts_version: 1.3.0
+ script_version: 1.3.0-SNAPSHOT
+ key_name: vbrgemu_key
+ 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_release_tag: v17.04
+ hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp
+ hc2vpp_source_repo_release_tag: v1.17.04
+ vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch
diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml
new file mode 100644
index 00000000..c5a3332e
--- /dev/null
+++ b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml
@@ -0,0 +1,189 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#==================LICENSE_END============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+##########################################################################
+
+heat_template_version: 2013-05-23
+
+description: Heat template to build vCPE vBRG Emulator (vBRGEMU)
+
+#######################################################################
+# #
+# PARAMETERS #
+# #
+# 0_port should get IP address from DHCP discover through vBNG #
+# DCAE is not monitoring the BRGEMULATOR #
+#######################################################################
+
+parameters:
+ vcpe_image_name:
+ type: string
+ label: Image name or ID
+ description: Image to be used for compute instance
+ vcpe_flavor_name:
+ type: string
+ label: Flavor
+ description: Type of instance (flavor) to be used
+ public_net_id:
+ type: string
+ label: Public network name or ID
+ description: Public network that enables remote connection to VNF
+ vbrgemu_name_0:
+ type: string
+ label: vBRG name
+ description: Name of the vBRG
+ vnf_id:
+ type: string
+ label: VNF ID
+ description: The VNF ID is provided by ONAP
+ vf_module_id:
+ type: string
+ label: vCPE module ID
+ description: The vCPE Module ID is provided by ONAP
+ key_name:
+ type: string
+ label: Key pair name
+ description: Public/Private key pair name
+ pub_key:
+ type: string
+ label: Public key
+ description: Public key to be installed on the compute instance
+ repo_url_artifacts:
+ type: string
+ label: Repository URL
+ description: URL of the repository that hosts the demo packages
+ script_version:
+ type: string
+ label: Build script version number
+ description: Version number of the scripts that builds the vFW demo app
+ demo_artifacts_version:
+ type: string
+ label: Artifacts version used in demo vnfs
+ description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
+ cloud_env:
+ 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
+ compile_state:
+ type: string
+ label: Compile State
+ description: State to compile code or not; included for backwards compatibility
+
+#############
+# #
+# RESOURCES #
+# #
+#############
+
+resources:
+
+ random-str:
+ type: OS::Heat::RandomString
+ properties:
+ length: 4
+
+ my_keypair:
+ type: OS::Nova::KeyPair
+ properties:
+ name:
+ str_replace:
+ template: base_rand
+ params:
+ base: { get_param: key_name }
+ rand: { get_resource: random-str }
+ public_key: { get_param: pub_key }
+ save_private_key: false
+
+ vbrgemu_0:
+ type: OS::Nova::Server
+ properties:
+ image: { get_param: vcpe_image_name }
+ flavor: { get_param: vcpe_flavor_name }
+ name: { get_param: vbrgemu_name_0 }
+ key_name: { get_resource: my_keypair }
+ networks:
+ - network: { get_param: public_net_id }
+ metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+ user_data_format: RAW
+ user_data:
+ str_replace:
+ params:
+ __repo_url_artifacts__ : { get_param: repo_url_artifacts }
+ __demo_artifacts_version__ : { get_param: demo_artifacts_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 }
+ __compile_state__ : { get_param: compile_state }
+ __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+ template: |
+ #!/bin/bash
+
+ # Create configuration files
+ mkdir /opt/config
+ echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
+ echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_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 "__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 [[ "__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_build.sh
+ cd /opt
+ chmod +x v_brgemu_build.sh
+ ./v_brgemu_build.sh