diff options
Diffstat (limited to 'robot/assets/asdc/base_vcpe_vbng')
| -rw-r--r-- | robot/assets/asdc/base_vcpe_vbng/MANIFEST.json | 4 | ||||
| -rw-r--r-- | robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.env (renamed from robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng_rackspace.env) | 18 | ||||
| -rw-r--r-- | robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.yaml (renamed from robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng_rackspace.yaml) | 51 |
3 files changed, 49 insertions, 24 deletions
diff --git a/robot/assets/asdc/base_vcpe_vbng/MANIFEST.json b/robot/assets/asdc/base_vcpe_vbng/MANIFEST.json index f4fbb305..0b34111e 100644 --- a/robot/assets/asdc/base_vcpe_vbng/MANIFEST.json +++ b/robot/assets/asdc/base_vcpe_vbng/MANIFEST.json @@ -3,12 +3,12 @@ "description": "", "data": [ { - "file": "base_vcpe_vbng_rackspace.yaml", + "file": "base_vcpe_vbng.yaml", "type": "HEAT", "isBase": "true", "data": [ { - "file": "base_vcpe_vbng_rackspace.env", + "file": "base_vcpe_vbng.env", "type": "HEAT_ENV" } ] diff --git a/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng_rackspace.env b/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.env index e363b3d7..be4f9728 100644 --- a/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng_rackspace.env +++ b/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.env @@ -1,13 +1,16 @@ parameters: - vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) - vcpe_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 + vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) + vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) + public_net_id: PUT THE PUBLIC NETWORK ID HERE brgemu_bng_private_net_id: zdfw1bngin01_private + brgemu_bng_private_subnet_id: zdfw1bngin01_sub_private bng_gmux_private_net_id: zdfw1bngmux01_private - onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE> - onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE> + bng_gmux_private_subnet_id: zdfw1bngmux01_sub_private + onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE onap_private_net_cidr: 10.0.0.0/16 cpe_signal_net_id: zdfw1cpe01_private + cpe_signal_subnet_id: zdfw1cpe01_sub_private brgemu_bng_private_net_cidr: 10.3.0.0/24 bng_gmux_private_net_cidr: 10.1.0.0/24 cpe_signal_private_net_cidr: 10.4.0.0/24 @@ -26,4 +29,7 @@ install_script_version: 1.1.0-SNAPSHOT key_name: vbng_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: rackspace + 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 + vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch diff --git a/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng_rackspace.yaml b/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.yaml index d5c0eed8..9cc44840 100644 --- a/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng_rackspace.yaml +++ b/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.yaml @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template to deploy vCPE virtual Broadband Network Gateway (vBNG) for ONAP +description: Heat template to deploy vCPE virtual Broadband Network Gateway (vBNG) ############## # # @@ -49,6 +49,10 @@ parameters: type: string label: vBNG IN private network name or ID description: Private network that connects vBRG to vBNG + brgemu_bng_private_subnet_id: + type: string + label: vBNG IN private sub-network name or ID + description: vBNG IN private sub-network name or ID brgemu_bng_private_net_cidr: type: string label: vBNG IN private network CIDR @@ -57,6 +61,10 @@ parameters: type: string label: vBNG vGMUX private network name or ID description: Private network that connects vBNG to vGMUX + bng_gmux_private_subnet_id: + type: string + label: vBNG vGMUX private sub-network name or ID + description: vBNG vGMUX private sub-network name or ID bng_gmux_private_net_cidr: type: string label: vGMUX private network CIDR @@ -77,6 +85,10 @@ parameters: type: string label: vCPE private network name or ID description: Private network that connects vCPE elements with vCPE infrastructure elements + cpe_signal_subnet_id: + type: string + label: vCPE private sub-network name or ID + description: vCPE private sub-network name or ID cpe_signal_private_net_cidr: type: string label: vAAA private network CIDR @@ -145,6 +157,18 @@ 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_branch: + type: string + label: VPP Source Git Branch + description: Git Branch for the VPP source codes + vpp_patch_url: + type: string + label: VPP Patch URL + description: URL for VPP patch for vBNG ############# # # @@ -171,24 +195,13 @@ resources: public_key: { get_param: pub_key } save_private_key: false - brgemu_bng_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: brgemu_bng_private_net_id } - - brgemu_bng_private_subnet: - type: OS::Neutron::Subnet - properties: - name: { get_param: brgemu_bng_private_net_id } - network_id: { get_resource: brgemu_bng_private_network } - cidr: { get_param: brgemu_bng_private_net_cidr } # Virtual BNG Instantiation vbng_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: brgemu_bng_private_network } - fixed_ips: [{"subnet": { get_resource: brgemu_bng_private_subnet }, "ip_address": { get_param: vbng_private_ip_0 }}] + network: { get_param: brgemu_bng_private_net_id } + fixed_ips: [{"subnet": { get_param: brgemu_bng_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_0 }}] vbng_private_1_port: type: OS::Neutron::Port @@ -200,13 +213,13 @@ resources: type: OS::Neutron::Port properties: network: { get_param: cpe_signal_net_id } - fixed_ips: [{"subnet": { get_param: cpe_signal_net_id }, "ip_address": { get_param: vbng_private_ip_2 }}] + fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vbng_private_ip_2 }}] vbng_private_3_port: type: OS::Neutron::Port properties: network: { get_param: bng_gmux_private_net_id } - fixed_ips: [{"subnet": { get_param: bng_gmux_private_net_id }, "ip_address": { get_param: vbng_private_ip_3 }}] + fixed_ips: [{"subnet": { get_param: bng_gmux_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_3 }}] vbng_0: type: OS::Nova::Server @@ -240,6 +253,9 @@ resources: __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } + __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } + __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } + __vpp_patch_url__ : { get_param: vpp_patch_url } template: | #!/bin/bash @@ -260,6 +276,9 @@ resources: echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_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_branch__" > /opt/config/vpp_source_repo_branch.txt + echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh |