diff options
22 files changed, 651 insertions, 2282 deletions
diff --git a/robot/assets/asdc/base_clearwater/MANIFEST.json b/robot/assets/asdc/base_clearwater/MANIFEST.json deleted file mode 100644 index f2beda9e..00000000 --- a/robot/assets/asdc/base_clearwater/MANIFEST.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "Project Clearwater", - "description": "Project Clearwater IMS", - "data": [ - { - "file": "base_clearwater.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_clearwater.env", - "type": "HEAT_ENV" - } - ] - }, - { - "file": "bono.yaml", - "type": "HEAT", - "isBase": "false" - }, - { - "file": "dns.yaml", - "type": "HEAT", - "isBase": "false" - }, - { - "file": "ellis.yaml", - "type": "HEAT", - "isBase": "false" - }, - { - "file": "homer.yaml", - "type": "HEAT", - "isBase": "false" - }, - { - "file": "homestead.yaml", - "type": "HEAT", - "isBase": "false" - }, - { - "file": "ralf.yaml", - "type": "HEAT", - "isBase": "false" - }, - { - "file": "sprout.yaml", - "type": "HEAT", - "isBase": "false" - } - ] -} diff --git a/robot/assets/asdc/base_clearwater/base_clearwater.env b/robot/assets/asdc/base_clearwater/base_clearwater.env deleted file mode 100644 index d4a77e49..00000000 --- a/robot/assets/asdc/base_clearwater/base_clearwater.env +++ /dev/null @@ -1,21 +0,0 @@ -parameters: - public_net_id: 00000000-0000-0000-0000-000000000000 - bono_flavor_name: 4 GB General Purpose v1 - sprout_flavor_name: 4 GB General Purpose v1 - homer_flavor_name: 4 GB General Purpose v1 - homestead_flavor_name: 4 GB General Purpose v1 - ralf_flavor_name: 4 GB General Purpose v1 - ellis_flavor_name: 4 GB General Purpose v1 - dns_flavor_name: 4 GB General Purpose v1 - bono_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - sprout_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - homer_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - homestead_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - ralf_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - ellis_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - dns_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - repo_url: http://repo.cw-ngv.com/stable - zone: me.cw-ngv.com - dn_range_start: "2425550000" - dn_range_length: "10000" - dnssec_key: 9FPdYTWhk5+LbhrqtTPQKw==
\ No newline at end of file diff --git a/robot/assets/asdc/base_clearwater/base_clearwater.yaml b/robot/assets/asdc/base_clearwater/base_clearwater.yaml deleted file mode 100644 index c41b0509..00000000 --- a/robot/assets/asdc/base_clearwater/base_clearwater.yaml +++ /dev/null @@ -1,322 +0,0 @@ -# Project Clearwater - IMS in the Cloud -# Copyright (C) 2015 Metaswitch Networks Ltd -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version, along with the "Special Exception" for use of -# the program along with SSL, set forth below. This program is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; -# without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# The author can be reached by email at clearwater@metaswitch.com or by -# post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK -# -# Special Exception -# Metaswitch Networks Ltd grants you permission to copy, modify, -# propagate, and distribute a work formed by combining OpenSSL with The -# Software, or a work derivative of such a combination, even if such -# copying, modification, propagation, or distribution would otherwise -# violate the terms of the GPL. You must comply with the GPL in all -# respects for all of the code used other than OpenSSL. -# "OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -# Project and licensed under the OpenSSL Licenses, or a work based on such -# software and licensed under the OpenSSL Licenses. -# "OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -# under which the OpenSSL Project distributes the OpenSSL toolkit software, -# as those licenses appear in the file LICENSE-OPENSSL. - -heat_template_version: 2013-05-23 - -description: > - Base Project Clearwater deployment on ONAP (Open Network Automation Platform) - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID provided by ONAP - vf_module_id: - type: string - label: VNF module ID - description: The VNF module ID provided by ONAP - public_net_id: - type: string - description: ID of public network - constraints: - - custom_constraint: neutron.network - description: Must be a valid network ID - bono_flavor_name: - type: string - description: VM flavor for bono VMs - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - sprout_flavor_name: - type: string - description: VM flavor for sprout VMs - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - homestead_flavor_name: - type: string - description: VM flavor for homestead VMs - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - homer_flavor_name: - type: string - description: VM flavor for homer VMs - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - ralf_flavor_name: - type: string - description: VM flavor for ralf VMs - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - ellis_flavor_name: - type: string - description: VM flavor for ellis VM - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - dns_flavor_name: - type: string - description: VM flavor for dns VM - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - bono_image_name: - type: string - description: Name of image for bono VMs - sprout_image_name: - type: string - description: Name of image for sprout VMs - homestead_image_name: - type: string - description: Name of image for homestead VMs - homer_image_name: - type: string - description: Name of image for homer VMs - ralf_image_name: - type: string - description: Name of image for ralf VMs - ellis_image_name: - type: string - description: Name of image for ellis VM - dns_image_name: - type: string - description: Name of image for dns VMs - key_name: - type: string - description: Name of keypair to create - pub_key: - type: string - label: Public key - description: Public key to be installed on all compute instances - repo_url: - type: string - description: URL for Clearwater repository - default: http://repo.cw-ngv.com/stable - zone: - type: string - description: DNS zone - default: example.com - dn_range_start: - type: string - description: First directory number in pool - default: "6505550000" - constraints: - - allowed_pattern: "[0-9]+" - description: Must be numeric - dn_range_length: - type: string - description: Number of directory numbers to add to pool - default: "1000" - constraints: - - allowed_pattern: "[0-9]+" - description: Must be numeric - dnssec_key: - type: string - description: DNSSEC private key (Base64-encoded) - constraints: - - allowed_pattern: "[0-9A-Za-z+/=]+" - description: Must be Base64-encoded - -resources: - cw_keypair: - type: OS::Nova::KeyPair - properties: - name: { get_param: key_name } - public_key: { get_param: pub_key } - save_private_key: false - -# security_groups: -# type: security-groups.yaml -# properties: -# name_prefix: { get_param: "OS::stack_name" } - - dns: - type: dns.yaml - properties: - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - public_net_id: { get_param: public_net_id } - dns_flavor_name: { get_param: dns_flavor_name } - dns_image_name: { get_param: dns_image_name } - key_name: { get_resource: cw_keypair } -# dns_security_group: { get_attr: [ security_groups, dns ] } - zone: { get_param: zone } - dnssec_key: { get_param: dnssec_key } - - - ellis: - type: ellis.yaml - properties: - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - public_net_id: { get_param: public_net_id } - ellis_flavor_name: { get_param: ellis_flavor_name } - ellis_image_name: { get_param: ellis_image_name } - key_name: { get_resource: cw_keypair } -# base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] } -# ellis_mgmt_security_group: { get_attr: [ security_groups, ellis_mgmt ] } - repo_url: { get_param: repo_url } - zone: { get_param: zone } - dn_range_start: { get_param: dn_range_start } - dn_range_length: { get_param: dn_range_length } - dns_ip: { get_attr: [ dns, dns_ip ] } - dnssec_key: { get_param: dnssec_key } - - bono: - type: OS::Heat::ResourceGroup - properties: - count: 2 - index_var: "__index__" - resource_def: - type: bono.yaml - properties: - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - public_net_id: { get_param: public_net_id } - bono_flavor_name: { get_param: bono_flavor_name } - bono_image_name: { get_param: bono_image_name } - key_name: { get_resource: cw_keypair } -# base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] } -# bono_sig_security_group: { get_attr: [ security_groups, bono_sig ] } - repo_url: { get_param: repo_url } - zone: { get_param: zone } - dns_ip: { get_attr: [ dns, dns_ip ] } - dnssec_key: { get_param: dnssec_key } - etcd_ip: { get_attr: [ ellis, public_ip ] } - index: __index__ - - sprout: - type: OS::Heat::ResourceGroup - properties: - count: 2 - index_var: __index__ - resource_def: - type: sprout.yaml - properties: - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - public_net_id: { get_param: public_net_id } - sprout_flavor_name: { get_param: sprout_flavor_name } - sprout_image_name: { get_param: sprout_image_name } - key_name: { get_resource: cw_keypair } -# base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] } -# sprout_sig_security_group: { get_attr: [ security_groups, sprout_sig ] } -# sprout_sig2_security_group: { get_attr: [ security_groups, sprout_sig2 ] } - repo_url: { get_param: repo_url } - zone: { get_param: zone } - dns_ip: { get_attr: [ dns, dns_ip ] } - dnssec_key: { get_param: dnssec_key } - etcd_ip: { get_attr: [ ellis, public_ip ] } - index: __index__ - - homer: - type: OS::Heat::ResourceGroup - properties: - count: 2 - index_var: __index__ - resource_def: - type: homer.yaml - properties: - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - public_net_id: { get_param: public_net_id } - homer_flavor_name: { get_param: homer_flavor_name } - homer_image_name: { get_param: homer_image_name } - key_name: { get_resource: cw_keypair } -# base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] } -# homer_mgmt_security_group: { get_attr: [ security_groups, homer_mgmt ] } -# homer_sig_security_group: { get_attr: [ security_groups, homer_sig ] } - repo_url: { get_param: repo_url } - zone: { get_param: zone } - dns_ip: { get_attr: [ dns, dns_ip ] } - dnssec_key: { get_param: dnssec_key } - etcd_ip: { get_attr: [ ellis, public_ip ] } - index: __index__ - - homestead: - type: OS::Heat::ResourceGroup - properties: - count: 2 - index_var: __index__ - resource_def: - type: homestead.yaml - properties: - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - public_net_id: { get_param: public_net_id } - homestead_flavor_name: { get_param: homestead_flavor_name } - homestead_image_name: { get_param: homestead_image_name } - key_name: { get_resource: cw_keypair } -# base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] } -# homestead_mgmt_security_group: { get_attr: [ security_groups, homestead_mgmt ] } -# homestead_sig_security_group: { get_attr: [ security_groups, homestead_sig ] } - repo_url: { get_param: repo_url } - zone: { get_param: zone } - dns_ip: { get_attr: [ dns, dns_ip ] } - dnssec_key: { get_param: dnssec_key } - etcd_ip: { get_attr: [ ellis, public_ip ] } - index: __index__ - - ralf: - type: OS::Heat::ResourceGroup - properties: - count: 2 - index_var: __index__ - resource_def: - type: ralf.yaml - properties: - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - public_net_id: { get_param: public_net_id } - ralf_flavor_name: { get_param: ralf_flavor_name } - ralf_image_name: { get_param: ralf_image_name } - key_name: { get_resource: cw_keypair } -# base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] } -# ralf_sig_security_group: { get_attr: [ security_groups, ralf_sig ] } - repo_url: { get_param: repo_url } - zone: { get_param: zone } - dns_ip: { get_attr: [ dns, dns_ip ] } - dnssec_key: { get_param: dnssec_key } - etcd_ip: { get_attr: [ ellis, public_ip ] } - index: __index__ - -outputs: - zone: - description: DNS zone - value: { get_param: zone } - dns_ip: - description: IP address of DNS - value: { get_attr: [ dns, dns_ip ] } - diff --git a/robot/assets/asdc/base_clearwater/bono.yaml b/robot/assets/asdc/base_clearwater/bono.yaml deleted file mode 100644 index 575dbb94..00000000 --- a/robot/assets/asdc/base_clearwater/bono.yaml +++ /dev/null @@ -1,191 +0,0 @@ -# Project Clearwater - IMS in the Cloud -# Copyright (C) 2015 Metaswitch Networks Ltd -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version, along with the "Special Exception" for use of -# the program along with SSL, set forth below. This program is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; -# without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# The author can be reached by email at clearwater@metaswitch.com or by -# post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK -# -# Special Exception -# Metaswitch Networks Ltd grants you permission to copy, modify, -# propagate, and distribute a work formed by combining OpenSSL with The -# Software, or a work derivative of such a combination, even if such -# copying, modification, propagation, or distribution would otherwise -# violate the terms of the GPL. You must comply with the GPL in all -# respects for all of the code used other than OpenSSL. -# "OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -# Project and licensed under the OpenSSL Licenses, or a work based on such -# software and licensed under the OpenSSL Licenses. -# "OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -# under which the OpenSSL Project distributes the OpenSSL toolkit software, -# as those licenses appear in the file LICENSE-OPENSSL. - -heat_template_version: 2013-05-23 - -description: > - Clearwater Bono node - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID provided by ONAP - vf_module_id: - type: string - label: VNF module ID - description: The VNF module ID provided by ONAP - public_net_id: - type: string - description: ID of public network - constraints: - - custom_constraint: neutron.network - description: Must be a valid network ID - bono_flavor_name: - type: string - description: Flavor to use - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - bono_image_name: - type: string - description: Name of image to use - key_name: - type: string - description: Name of keypair to assign - constraints: - - custom_constraint: nova.keypair - description: Must be a valid keypair name -# base_mgmt_security_group: -# type: string -# description: ID of base security group for all Clearwater nodes (managment) -# bono_sig_security_group: -# type: string -# description: ID of security group for Bono nodes (signaling) - repo_url: - type: string - description: URL for Clearwater repository - default: http://repo.cw-ngv.com/stable - zone: - type: string - description: DNS zone - default: example.com - dns_ip: - type: string - description: IP address for DNS server on management network - dnssec_key: - type: string - description: DNSSEC private key (Base64-encoded) - constraints: - - allowed_pattern: "[0-9A-Za-z+/=]+" - description: Must be Base64-encoded - etcd_ip: - type: string - description: IP address of an existing member of the etcd cluster - default: "" - index: - type: number - description: Index of this Bono node in the Bono cluster - default: 0 - -resources: - server: - type: OS::Nova::Server - properties: - name: { str_replace: { params: { __index__: { get_param: index }, __zone__: { get_param: zone } }, template: bono-__index__.__zone__ } } - image: { get_param: bono_image_name } - flavor: { get_param: bono_flavor_name } - key_name: { get_param: key_name } - 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__: { get_param: repo_url } - __zone__: { get_param: zone } - __dns_ip__: { get_param: dns_ip } - __dnssec_key__: { get_param: dnssec_key } - __etcd_ip__ : { get_param: etcd_ip } - __index__ : { get_param: index } - template: | - #!/bin/bash - - # Log all output to file. - exec > >(tee -a /var/log/clearwater-heat-bono.log) 2>&1 - set -x - - # Configure the APT software source. - echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list - curl -L http://repo.cw-ngv.com/repo_key | apt-key add - - apt-get update - - # Get the public IP address from eth0 - sudo apt-get install ipcalc - ADDR=`ip addr show eth0 | awk '/inet /{print $2}'` - PUBLIC_ADDR=`ipcalc -n -b $ADDR | awk '/Address:/{print $2}'` - - # Configure /etc/clearwater/local_config. - mkdir -p /etc/clearwater - etcd_ip=__etcd_ip__ - [ -n "$etcd_ip" ] || etcd_ip=$PUBLIC_ADDR - cat > /etc/clearwater/local_config << EOF - management_local_ip=$PUBLIC_ADDR - local_ip=$PUBLIC_ADDR - public_ip=$PUBLIC_ADDR - public_hostname=__index__.bono.__zone__ - etcd_cluster=$etcd_ip - EOF - - # Now install the software. - DEBIAN_FRONTEND=noninteractive apt-get install bono-node --yes --force-yes - DEBIAN_FRONTEND=noninteractive apt-get install clearwater-management --yes --force-yes - - # Function to give DNS record type and IP address for specified IP address - ip2rr() { - if echo $1 | grep -q -e '[^0-9.]' ; then - echo AAAA $1 - else - echo A $1 - fi - } - - # Update DNS - retries=0 - while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF - server __dns_ip__ - update add bono-__index__.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add __index__.bono.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add __zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add __zone__. 30 NAPTR 0 0 "s" "SIP+D2T" "" _sip._tcp.__zone__. - update add __zone__. 30 NAPTR 0 0 "s" "SIP+D2U" "" _sip._udp.__zone__. - update add _sip._tcp.__zone__. 30 SRV 0 0 5060 __index__.bono.__zone__. - update add _sip._udp.__zone__. 30 SRV 0 0 5060 __index__.bono.__zone__. - send - EOF - } && [ $retries -lt 10 ] - do - retries=$((retries + 1)) - echo 'nsupdate failed - retrying (retry '$retries')...' - sleep 5 - done - - # Use the DNS server. - echo 'nameserver __dns_ip__' > /etc/dnsmasq.resolv.conf - echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq - service dnsmasq force-reload - -outputs: - public_ip: - description: IP address in public network - value: { get_attr: [ server, accessIPv4 ] } diff --git a/robot/assets/asdc/base_clearwater/dns.yaml b/robot/assets/asdc/base_clearwater/dns.yaml deleted file mode 100644 index f257d240..00000000 --- a/robot/assets/asdc/base_clearwater/dns.yaml +++ /dev/null @@ -1,159 +0,0 @@ -# Project Clearwater - IMS in the Cloud -# Copyright (C) 2015 Metaswitch Networks Ltd -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version, along with the "Special Exception" for use of -# the program along with SSL, set forth below. This program is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; -# without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# The author can be reached by email at clearwater@metaswitch.com or by -# post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK -# -# Special Exception -# Metaswitch Networks Ltd grants you permission to copy, modify, -# propagate, and distribute a work formed by combining OpenSSL with The -# Software, or a work derivative of such a combination, even if such -# copying, modification, propagation, or distribution would otherwise -# violate the terms of the GPL. You must comply with the GPL in all -# respects for all of the code used other than OpenSSL. -# "OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -# Project and licensed under the OpenSSL Licenses, or a work based on such -# software and licensed under the OpenSSL Licenses. -# "OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -# under which the OpenSSL Project distributes the OpenSSL toolkit software, -# as those licenses appear in the file LICENSE-OPENSSL. - -heat_template_version: 2013-05-23 - -description: > - DNS server exposing dynamic DNS using DNSSEC - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID provided by ONAP - vf_module_id: - type: string - label: VNF module ID - description: The VNF module ID provided by ONAP - public_net_id: - type: string - description: ID of public network - constraints: - - custom_constraint: neutron.network - description: Must be a valid network ID - dns_flavor_name: - type: string - description: Flavor to use - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - dns_image_name: - type: string - description: Name of image to use - key_name: - type: string - description: Name of keypair to assign - constraints: - - custom_constraint: nova.keypair - description: Must be a valid keypair name -# dns_security_group: -# type: string -# description: ID of security group for DNS nodes - zone: - type: string - description: DNS zone - default: example.com - dnssec_key: - type: string - description: DNSSEC private key (Base64-encoded) - -resources: - server: - type: OS::Nova::Server - properties: - name: { str_replace: { params: { __zone__: { get_param: zone } }, template: ns.__zone__ } } - image: { get_param: dns_image_name } - flavor: { get_param: dns_flavor_name } - key_name: { get_param: key_name } - 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: - __zone__: { get_param: zone } - __dnssec_key__: { get_param: dnssec_key } - template: | - #!/bin/bash - - # Log all output to file. - exec > >(tee -a /var/log/clearwater-heat-dns.log) 2>&1 - set -x - - # Install BIND. - apt-get update - DEBIAN_FRONTEND=noninteractive apt-get install bind9 --yes - - # Get the public IP address from eth0 - sudo apt-get install ipcalc - ADDR=`ip addr show eth0 | awk '/inet /{print $2}'` - PUBLIC_ADDR=`ipcalc -n -b $ADDR | awk '/Address:/{print $2}'` - - # Update BIND configuration with the specified zone and key. - cat >> /etc/bind/named.conf.local << EOF - key __zone__. { - algorithm "HMAC-MD5"; - secret "__dnssec_key__"; - }; - - zone "__zone__" IN { - type master; - file "/var/lib/bind/db.__zone__"; - allow-update { - key __zone__.; - }; - }; - EOF - - # Function to give DNS record type and IP address for specified IP address - ip2rr() { - if echo $1 | grep -q -e '[^0-9.]' ; then - echo AAAA $1 - else - echo A $1 - fi - } - - # Create basic zone configuration. - cat > /var/lib/bind/db.__zone__ << EOF - \$ORIGIN __zone__. - \$TTL 1h - @ IN SOA ns admin\@__zone__. ( $(date +%Y%m%d%H) 1d 2h 1w 30s ) - @ NS ns - ns $(ip2rr $PUBLIC_ADDR) - EOF - chown root:bind /var/lib/bind/db.__zone__ - - # Now that BIND configuration is correct, kick it to reload. - service bind9 reload - -outputs: - dns_ip: - description: IP address of DNS server - value: { get_attr: [ server, accessIPv4 ] } - zone: - description: DNS zone - value: { get_param: zone } - dnssec_key: - description: DNSSEC private key (Base64-encoded) - value: { get_param: dnssec_key } diff --git a/robot/assets/asdc/base_clearwater/ellis.yaml b/robot/assets/asdc/base_clearwater/ellis.yaml deleted file mode 100644 index 76e68b03..00000000 --- a/robot/assets/asdc/base_clearwater/ellis.yaml +++ /dev/null @@ -1,242 +0,0 @@ -# Project Clearwater - IMS in the Cloud -# Copyright (C) 2015 Metaswitch Networks Ltd -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version, along with the "Special Exception" for use of -# the program along with SSL, set forth below. This program is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; -# without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# The author can be reached by email at clearwater@metaswitch.com or by -# post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK -# -# Special Exception -# Metaswitch Networks Ltd grants you permission to copy, modify, -# propagate, and distribute a work formed by combining OpenSSL with The -# Software, or a work derivative of such a combination, even if such -# copying, modification, propagation, or distribution would otherwise -# violate the terms of the GPL. You must comply with the GPL in all -# respects for all of the code used other than OpenSSL. -# "OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -# Project and licensed under the OpenSSL Licenses, or a work based on such -# software and licensed under the OpenSSL Licenses. -# "OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -# under which the OpenSSL Project distributes the OpenSSL toolkit software, -# as those licenses appear in the file LICENSE-OPENSSL. - -heat_template_version: 2013-05-23 - -description: > - Clearwater Ellis node - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID provided by ONAP - vf_module_id: - type: string - label: VNF module ID - description: The VNF module ID provided by ONAP - public_net_id: - type: string - description: ID of public network - constraints: - - custom_constraint: neutron.network - description: Must be a valid network ID - ellis_flavor_name: - type: string - description: Flavor to use - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - ellis_image_name: - type: string - description: Name of image to use - key_name: - type: string - description: Name of keypair to assign - constraints: - - custom_constraint: nova.keypair - description: Must be a valid keypair name -# base_mgmt_security_group: -# type: string -# description: ID of base security group for all Clearwater nodes (management) -# ellis_mgmt_security_group: -# type: string -# description: ID of security group for Ellis nodes (management) - repo_url: - type: string - description: URL for Clearwater repository - default: http://repo.cw-ngv.com/stable - zone: - type: string - description: DNS zone - default: example.com - dn_range_start: - type: string - description: First directory number in pool - default: "6505550000" - constraints: - - allowed_pattern: "[0-9]+" - description: Must be numeric - dn_range_length: - type: string - description: Number of directory numbers to add to pool - default: "1000" - constraints: - - allowed_pattern: "[0-9]+" - description: Must be numeric - dns_ip: - type: string - description: IP address for DNS server - dnssec_key: - type: string - description: DNSSEC private key (Base64-encoded) - constraints: - - allowed_pattern: "[0-9A-Za-z+/=]+" - description: Must be Base64-encoded - etcd_ip: - type: string - description: IP address of an existing member of the etcd cluster - default: "" - index: - type: number - description: Index of this Ellis node in the Ellis cluster - default: 0 - -resources: - server: - type: OS::Nova::Server - properties: - name: { str_replace: { params: { __index__: { get_param: index }, __zone__: { get_param: zone } }, template: ellis-__index__.__zone__ } } - image: { get_param: ellis_image_name } - flavor: { get_param: ellis_flavor_name } - key_name: { get_param: key_name } - 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__: { get_param: repo_url } - __zone__: { get_param: zone } - __dn_range_start__: { get_param: dn_range_start } - __dn_range_length__: { get_param: dn_range_length } - __dns_ip__: { get_param: dns_ip } - __dnssec_key__: { get_param: dnssec_key } - __etcd_ip__ : { get_param: etcd_ip } - __index__ : { get_param: index } - template: | - #!/bin/bash - - # Log all output to file. - exec > >(tee -a /var/log/clearwater-heat-ellis.log) 2>&1 - set -x - - # Configure the APT software source. - echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list - curl -L http://repo.cw-ngv.com/repo_key | apt-key add - - apt-get update - - # Get the public IP address from eth0 - sudo apt-get install ipcalc - ADDR=`ip addr show eth0 | awk '/inet /{print $2}'` - PUBLIC_ADDR=`ipcalc -n -b $ADDR | awk '/Address:/{print $2}'` - - # Configure /etc/clearwater/local_config. Add xdms_hostname here to use Homer's management - # hostname instead of signaling. This will override shared_config. This works around - # https://github.com/Metaswitch/ellis/issues/153. - mkdir -p /etc/clearwater - etcd_ip=__etcd_ip__ - [ -n "$etcd_ip" ] || etcd_ip=$PUBLIC_ADDR - cat > /etc/clearwater/local_config << EOF - local_ip=$PUBLIC_ADDR - public_ip=$PUBLIC_ADDR - public_hostname=ellis-__index__.__zone__ - etcd_cluster=$etcd_ip - xdms_hostname=homer-0.__zone__:7888 - EOF - - # Now install the software. - DEBIAN_FRONTEND=noninteractive apt-get install ellis-node --yes --force-yes - DEBIAN_FRONTEND=noninteractive apt-get install clearwater-management --yes --force-yes - - # Wait until etcd is up and running before uploading the shared_config - /usr/share/clearwater/clearwater-etcd/scripts/wait_for_etcd - - # Configure and upload /etc/clearwater/shared_config. - cat > /etc/clearwater/shared_config << EOF - # Deployment definitions - home_domain=__zone__ - sprout_hostname=sprout.__zone__ - hs_hostname=hs.__zone__:8888 - hs_provisioning_hostname=hs-prov.__zone__:8889 - ralf_hostname=ralf.__zone__:10888 - xdms_hostname=homer.__zone__:7888 - sprout_registration_store=sprout.__zone__ - ralf_session_store=ralf.__zone__ - - upstream_port=0 - - # Email server configuration - smtp_smarthost=localhost - smtp_username=username - smtp_password=password - email_recovery_sender=clearwater@example.org - - # Keys - signup_key=secret - turn_workaround=secret - ellis_api_key=secret - ellis_cookie_key=secret - EOF - sudo /usr/share/clearwater/clearwater-config-manager/scripts/upload_shared_config - - # Allocate a pool of numbers to assign to users. Before we do this, - # restart clearwater-infrastructure to make sure that - # local_settings.py runs to pick up the configuration changes. - service clearwater-infrastructure restart - service ellis stop - /usr/share/clearwater/ellis/env/bin/python /usr/share/clearwater/ellis/src/metaswitch/ellis/tools/create_numbers.py --start __dn_range_start__ --count __dn_range_length__ - - # Function to give DNS record type and IP address for specified IP address - ip2rr() { - if echo $1 | grep -q -e '[^0-9.]' ; then - echo AAAA $1 - else - echo A $1 - fi - } - - # Update DNS - retries=0 - while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF - server __dns_ip__ - update add ellis-__index__.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add ellis.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - send - EOF - } && [ $retries -lt 10 ] - do - retries=$((retries + 1)) - echo 'nsupdate failed - retrying (retry '$retries')...' - sleep 5 - done - - # Use the DNS server. - echo 'nameserver __dns_ip__' > /etc/dnsmasq.resolv.conf - echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq - service dnsmasq force-reload - -outputs: - public_ip: - description: IP address in public network - value: { get_attr: [ server, accessIPv4 ] } diff --git a/robot/assets/asdc/base_clearwater/homer.yaml b/robot/assets/asdc/base_clearwater/homer.yaml deleted file mode 100644 index cbf9733f..00000000 --- a/robot/assets/asdc/base_clearwater/homer.yaml +++ /dev/null @@ -1,190 +0,0 @@ -# Project Clearwater - IMS in the Cloud -# Copyright (C) 2015 Metaswitch Networks Ltd -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version, along with the "Special Exception" for use of -# the program along with SSL, set forth below. This program is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; -# without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# The author can be reached by email at clearwater@metaswitch.com or by -# post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK -# -# Special Exception -# Metaswitch Networks Ltd grants you permission to copy, modify, -# propagate, and distribute a work formed by combining OpenSSL with The -# Software, or a work derivative of such a combination, even if such -# copying, modification, propagation, or distribution would otherwise -# violate the terms of the GPL. You must comply with the GPL in all -# respects for all of the code used other than OpenSSL. -# "OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -# Project and licensed under the OpenSSL Licenses, or a work based on such -# software and licensed under the OpenSSL Licenses. -# "OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -# under which the OpenSSL Project distributes the OpenSSL toolkit software, -# as those licenses appear in the file LICENSE-OPENSSL. - -heat_template_version: 2013-05-23 - -description: > - Clearwater Homer node - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID provided by ONAP - vf_module_id: - type: string - label: VNF module ID - description: The VNF module ID provided by ONAP - public_net_id: - type: string - description: ID of public network - constraints: - - custom_constraint: neutron.network - description: Must be a valid network ID - homer_flavor_name: - type: string - description: Flavor to use - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - homer_image_name: - type: string - description: Name of image to use - key_name: - type: string - description: Name of keypair to assign - constraints: - - custom_constraint: nova.keypair - description: Must be a valid keypair name -# base_mgmt_security_group: -# type: string -# description: ID of base security group for all Clearwater nodes (management) -# homer_mgmt_security_group: -# type: string -# description: ID of security group for Homer nodes (maangement) -# homer_sig_security_group: -# type: string -# description: ID of security group for Homer nodes (signaling) - repo_url: - type: string - description: URL for Clearwater repository - default: http://repo.cw-ngv.com/stable - zone: - type: string - description: DNS zone - default: example.com - dns_ip: - type: string - description: IP address for DNS server on management network - dnssec_key: - type: string - description: DNSSEC private key (Base64-encoded) - constraints: - - allowed_pattern: "[0-9A-Za-z+/=]+" - description: Must be Base64-encoded - etcd_ip: - type: string - description: IP address of an existing member of the etcd cluster - default: "" - index: - type: number - description: Index of this Homer node in the Homer cluster - default: 0 - -resources: - server: - type: OS::Nova::Server - properties: - name: { str_replace: { params: { __index__: { get_param: index }, __zone__: { get_param: zone } }, template: homer-__index__.__zone__ } } - image: { get_param: homer_image_name } - flavor: { get_param: homer_flavor_name } - key_name: { get_param: key_name } - 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__: { get_param: repo_url } - __zone__: { get_param: zone } - __dns_ip__: { get_param: dns_ip } - __dnssec_key__: { get_param: dnssec_key } - __etcd_ip__ : { get_param: etcd_ip } - __index__ : { get_param: index } - template: | - #!/bin/bash - - # Log all output to file. - exec > >(tee -a /var/log/clearwater-heat-homer.log) 2>&1 - set -x - - # Configure the APT software source. - echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list - curl -L http://repo.cw-ngv.com/repo_key | apt-key add - - apt-get update - - # Get the public IP address from eth0 - sudo apt-get install ipcalc - ADDR=`ip addr show eth0 | awk '/inet /{print $2}'` - PUBLIC_ADDR=`ipcalc -n -b $ADDR | awk '/Address:/{print $2}'` - - # Configure /etc/clearwater/local_config. - mkdir -p /etc/clearwater - etcd_ip=__etcd_ip__ - [ -n "$etcd_ip" ] || etcd_ip=$PUBLIC_ADDR - cat > /etc/clearwater/local_config << EOF - management_local_ip=$PUBLIC_ADDR - local_ip=$PUBLIC_ADDR - public_ip=$PUBLIC_ADDR - public_hostname=homer-__index__.__zone__ - etcd_cluster=$etcd_ip - EOF - - # Now install the software. - DEBIAN_FRONTEND=noninteractive apt-get install homer-node --yes --force-yes - DEBIAN_FRONTEND=noninteractive apt-get install clearwater-management --yes --force-yes - - # Function to give DNS record type and IP address for specified IP address - ip2rr() { - if echo $1 | grep -q -e '[^0-9.]' ; then - echo AAAA $1 - else - echo A $1 - fi - } - - # Update DNS - retries=0 - while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF - server __dns_ip__ - update add homer-__index__.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add homer.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - send - EOF - } && [ $retries -lt 10 ] - do - retries=$((retries + 1)) - echo 'nsupdate failed - retrying (retry '$retries')...' - sleep 5 - done - - # Use the DNS server. - # Use the DNS server. - echo 'nameserver __dns_ip__' > /etc/dnsmasq.resolv.conf - echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq - service dnsmasq force-reload - -outputs: - public_ip: - description: IP address in public network - value: { get_attr: [ server, accessIPv4 ] } diff --git a/robot/assets/asdc/base_clearwater/homestead.yaml b/robot/assets/asdc/base_clearwater/homestead.yaml deleted file mode 100644 index f3519bb7..00000000 --- a/robot/assets/asdc/base_clearwater/homestead.yaml +++ /dev/null @@ -1,190 +0,0 @@ -# Project Clearwater - IMS in the Cloud -# Copyright (C) 2015 Metaswitch Networks Ltd -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version, along with the "Special Exception" for use of -# the program along with SSL, set forth below. This program is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; -# without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# The author can be reached by email at clearwater@metaswitch.com or by -# post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK -# -# Special Exception -# Metaswitch Networks Ltd grants you permission to copy, modify, -# propagate, and distribute a work formed by combining OpenSSL with The -# Software, or a work derivative of such a combination, even if such -# copying, modification, propagation, or distribution would otherwise -# violate the terms of the GPL. You must comply with the GPL in all -# respects for all of the code used other than OpenSSL. -# "OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -# Project and licensed under the OpenSSL Licenses, or a work based on such -# software and licensed under the OpenSSL Licenses. -# "OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -# under which the OpenSSL Project distributes the OpenSSL toolkit software, -# as those licenses appear in the file LICENSE-OPENSSL. - -heat_template_version: 2013-05-23 - -description: > - Clearwater Homestead node - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID provided by ONAP - vf_module_id: - type: string - label: VNF module ID - description: The VNF module ID provided by ONAP - public_net_id: - type: string - description: ID of public network - constraints: - - custom_constraint: neutron.network - description: Must be a valid network ID - homestead_flavor_name: - type: string - description: Flavor to use - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - homestead_image_name: - type: string - description: Name of image to use - key_name: - type: string - description: Name of keypair to assign - constraints: - - custom_constraint: nova.keypair - description: Must be a valid keypair name -# base_mgmt_security_group: -# type: string -# description: ID of base security group for all Clearwater nodes (management) -# homestead_mgmt_security_group: -# type: string -# description: ID of security group for Homestead nodes (management) -# homestead_sig_security_group: -# type: string -# description: ID of security group for Homestead nodes (signaling) - repo_url: - type: string - description: URL for Clearwater repository - default: http://repo.cw-ngv.com/stable - zone: - type: string - description: DNS zone - default: example.com - dns_ip: - type: string - description: IP address for DNS server on management network - dnssec_key: - type: string - description: DNSSEC private key (Base64-encoded) - constraints: - - allowed_pattern: "[0-9A-Za-z+/=]+" - description: Must be Base64-encoded - etcd_ip: - type: string - description: IP address of an existing member of the etcd cluster - default: "" - index: - type: number - description: Index of this Homestead node in the Homestead cluster - default: 0 - -resources: - server: - type: OS::Nova::Server - properties: - name: { str_replace: { params: { __index__: { get_param: index }, __zone__: { get_param: zone } }, template: homestead-__index__.__zone__ } } - image: { get_param: homestead_image_name } - flavor: { get_param: homestead_flavor_name } - key_name: { get_param: key_name } - 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__: { get_param: repo_url } - __zone__: { get_param: zone } - __dns_ip__: { get_param: dns_ip } - __dnssec_key__: { get_param: dnssec_key } - __etcd_ip__ : { get_param: etcd_ip } - __index__ : { get_param: index } - template: | - #!/bin/bash - - # Log all output to file. - exec > >(tee -a /var/log/clearwater-heat-homestead.log) 2>&1 - set -x - - # Configure the APT software source. - echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list - curl -L http://repo.cw-ngv.com/repo_key | apt-key add - - apt-get update - - # Get the public IP address from eth0 - sudo apt-get install ipcalc - ADDR=`ip addr show eth0 | awk '/inet /{print $2}'` - PUBLIC_ADDR=`ipcalc -n -b $ADDR | awk '/Address:/{print $2}'` - - # Configure /etc/clearwater/local_config. - mkdir -p /etc/clearwater - etcd_ip=__etcd_ip__ - [ -n "$etcd_ip" ] || etcd_ip=$PUBLIC_ADDR - cat > /etc/clearwater/local_config << EOF - management_local_ip=$PUBLIC_ADDR - local_ip=$PUBLIC_ADDR - public_ip=$PUBLIC_ADDR - public_hostname=homestead-__index__.__zone__ - etcd_cluster=$etcd_ip - EOF - - # Now install the software. - DEBIAN_FRONTEND=noninteractive apt-get install homestead-node clearwater-prov-tools --yes --force-yes - DEBIAN_FRONTEND=noninteractive apt-get install clearwater-management --yes --force-yes - - # Function to give DNS record type and IP address for specified IP address - ip2rr() { - if echo $1 | grep -q -e '[^0-9.]' ; then - echo AAAA $1 - else - echo A $1 - fi - } - - # Update DNS - retries=0 - while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF - server __dns_ip__ - update add homestead-__index__.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add hs-prov.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add hs.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - send - EOF - } && [ $retries -lt 10 ] - do - retries=$((retries + 1)) - echo 'nsupdate failed - retrying (retry '$retries')...' - sleep 5 - done - - # Use the DNS server. - echo 'nameserver __dns_ip__' > /etc/dnsmasq.resolv.conf - echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq - service dnsmasq force-reload - -outputs: - public_ip: - description: IP address in public network - value: { get_attr: [ server, accessIPv4 ] } diff --git a/robot/assets/asdc/base_clearwater/ralf.yaml b/robot/assets/asdc/base_clearwater/ralf.yaml deleted file mode 100644 index 301a5619..00000000 --- a/robot/assets/asdc/base_clearwater/ralf.yaml +++ /dev/null @@ -1,205 +0,0 @@ -# Project Clearwater - IMS in the Cloud -# Copyright (C) 2015 Metaswitch Networks Ltd -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version, along with the "Special Exception" for use of -# the program along with SSL, set forth below. This program is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; -# without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# The author can be reached by email at clearwater@metaswitch.com or by -# post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK -# -# Special Exception -# Metaswitch Networks Ltd grants you permission to copy, modify, -# propagate, and distribute a work formed by combining OpenSSL with The -# Software, or a work derivative of such a combination, even if such -# copying, modification, propagation, or distribution would otherwise -# violate the terms of the GPL. You must comply with the GPL in all -# respects for all of the code used other than OpenSSL. -# "OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -# Project and licensed under the OpenSSL Licenses, or a work based on such -# software and licensed under the OpenSSL Licenses. -# "OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -# under which the OpenSSL Project distributes the OpenSSL toolkit software, -# as those licenses appear in the file LICENSE-OPENSSL. - -heat_template_version: 2013-05-23 - -description: > - Clearwater Ralf node - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID provided by ONAP - vf_module_id: - type: string - label: VNF module ID - description: The VNF module ID provided by ONAP - public_net_id: - type: string - description: ID of public network - constraints: - - custom_constraint: neutron.network - description: Must be a valid network ID - ralf_flavor_name: - type: string - description: Flavor to use - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - ralf_image_name: - type: string - description: Name of image to use - key_name: - type: string - description: Name of keypair to assign - constraints: - - custom_constraint: nova.keypair - description: Must be a valid keypair name -# base_mgmt_security_group: -# type: string -# description: ID of base security group for all Clearwater nodes (management) -# ralf_sig_security_group: -# type: string -# description: ID of security group for Ralf nodes (signaling) - repo_url: - type: string - description: URL for Clearwater repository - default: http://repo.cw-ngv.com/stable - zone: - type: string - description: DNS zone - default: example.com - dns_ip: - type: string - description: IP address for DNS server - dnssec_key: - type: string - description: DNSSEC private key (Base64-encoded) - constraints: - - allowed_pattern: "[0-9A-Za-z+/=]+" - description: Must be Base64-encoded - etcd_ip: - type: string - description: IP address of an existing member of the etcd cluster - default: "" - index: - type: number - description: Index of this Ralf node in the Ralf cluster - default: 0 - -resources: - server: - type: OS::Nova::Server - properties: - name: { str_replace: { params: { __index__: { get_param: index }, __zone__: { get_param: zone } }, template: ralf-__index__.__zone__ } } - image: { get_param: ralf_image_name } - flavor: { get_param: ralf_flavor_name } - key_name: { get_param: key_name } - 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__: { get_param: repo_url } - __zone__: { get_param: zone } - __dns_ip__: { get_param: dns_ip } - __dnssec_key__: { get_param: dnssec_key } - __etcd_ip__ : { get_param: etcd_ip } - __index__ : { get_param: index } - template: | - #!/bin/bash - - # Log all output to file. - exec > >(tee -a /var/log/clearwater-heat-ralf.log) 2>&1 - set -x - - # Configure the APT software source. - echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list - curl -L http://repo.cw-ngv.com/repo_key | apt-key add - - apt-get update - - # Get the public IP address from eth0 - sudo apt-get install ipcalc - ADDR=`ip addr show eth0 | awk '/inet /{print $2}'` - PUBLIC_ADDR=`ipcalc -n -b $ADDR | awk '/Address:/{print $2}'` - - # Configure /etc/clearwater/local_config. - mkdir -p /etc/clearwater - etcd_ip=__etcd_ip__ - [ -n "$etcd_ip" ] || etcd_ip=$PUBLIC_ADDR - cat > /etc/clearwater/local_config << EOF - management_local_ip=$PUBLIC_ADDR - local_ip=$PUBLIC_ADDR - public_ip=$PUBLIC_ADDR - public_hostname=ralf-__index__.__zone__ - etcd_cluster=$etcd_ip - EOF - - # Create /etc/chronos/chronos.conf. - mkdir -p /etc/chronos - cat > /etc/chronos/chronos.conf << EOF - [http] - bind-address = $PUBLIC_ADDR - bind-port = 7253 - threads = 50 - - [logging] - folder = /var/log/chronos - level = 2 - - [alarms] - enabled = true - - [exceptions] - max_ttl = 600 - EOF - - # Now install the software. - DEBIAN_FRONTEND=noninteractive apt-get install ralf-node --yes --force-yes - DEBIAN_FRONTEND=noninteractive apt-get install clearwater-management --yes --force-yes - - # Function to give DNS record type and IP address for specified IP address - ip2rr() { - if echo $1 | grep -q -e '[^0-9.]' ; then - echo AAAA $1 - else - echo A $1 - fi - } - - # Update DNS - retries=0 - while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF - server __dns_ip__ - update add ralf-__index__.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add ralf.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - send - EOF - } && [ $retries -lt 10 ] - do - retries=$((retries + 1)) - echo 'nsupdate failed - retrying (retry '$retries')...' - sleep 5 - done - - # Use the DNS server. - echo 'nameserver __dns_ip__' > /etc/dnsmasq.resolv.conf - echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq - service dnsmasq force-reload - -outputs: - public_ip: - description: IP address in public network - value: { get_attr: [ server, accessIPv4 ] } diff --git a/robot/assets/asdc/base_clearwater/sprout.yaml b/robot/assets/asdc/base_clearwater/sprout.yaml deleted file mode 100644 index 7fb9dd81..00000000 --- a/robot/assets/asdc/base_clearwater/sprout.yaml +++ /dev/null @@ -1,217 +0,0 @@ -# Project Clearwater - IMS in the Cloud -# Copyright (C) 2015 Metaswitch Networks Ltd -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version, along with the "Special Exception" for use of -# the program along with SSL, set forth below. This program is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; -# without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# The author can be reached by email at clearwater@metaswitch.com or by -# post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK -# -# Special Exception -# Metaswitch Networks Ltd grants you permission to copy, modify, -# propagate, and distribute a work formed by combining OpenSSL with The -# Software, or a work derivative of such a combination, even if such -# copying, modification, propagation, or distribution would otherwise -# violate the terms of the GPL. You must comply with the GPL in all -# respects for all of the code used other than OpenSSL. -# "OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -# Project and licensed under the OpenSSL Licenses, or a work based on such -# software and licensed under the OpenSSL Licenses. -# "OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -# under which the OpenSSL Project distributes the OpenSSL toolkit software, -# as those licenses appear in the file LICENSE-OPENSSL. - -heat_template_version: 2013-05-23 - -description: > - Clearwater Sprout node - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID provided by ONAP - vf_module_id: - type: string - label: VNF module ID - description: The VNF module ID provided by ONAP - public_net_id: - type: string - description: ID of public network - constraints: - - custom_constraint: neutron.network - description: Must be a valid network ID - sprout_flavor_name: - type: string - description: Flavor to use - constraints: - - custom_constraint: nova.flavor - description: Must be a valid flavor name - sprout_image_name: - type: string - description: Name of image to use - key_name: - type: string - description: Name of keypair to assign - constraints: - - custom_constraint: nova.keypair - description: Must be a valid keypair name -# base_mgmt_security_group: -# type: string -# description: ID of base security group for all Clearwater nodes (management) -# sprout_sig_security_group: -# type: string -# description: ID of security group for Sprout nodes (signaling) -# sprout_sig2_security_group: -# type: string -# description: ID of additional security group for Sprout nodes (signaling) - repo_url: - type: string - description: URL for Clearwater repository - default: http://repo.cw-ngv.com/stable - zone: - type: string - description: DNS zone - default: example.com - dns_ip: - type: string - description: IP address for DNS server on network - dnssec_key: - type: string - description: DNSSEC private key (Base64-encoded) - constraints: - - allowed_pattern: "[0-9A-Za-z+/=]+" - description: Must be Base64-encoded - etcd_ip: - type: string - description: IP address of an existing member of the etcd cluster - default: "" - index: - type: number - description: Index of this Sprout node in the Sprout cluster - default: 0 - -resources: - server: - type: OS::Nova::Server - properties: - name: { str_replace: { params: { __index__: { get_param: index }, __zone__: { get_param: zone } }, template: sprout-__index__.__zone__ } } - image: { get_param: sprout_image_name } - flavor: { get_param: sprout_flavor_name } - key_name: { get_param: key_name } - 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__: { get_param: repo_url } - __zone__: { get_param: zone } - __dns_ip__: { get_param: dns_ip } - __dnssec_key__: { get_param: dnssec_key } - __etcd_ip__ : { get_param: etcd_ip } - __index__ : { get_param: index } - template: | - #!/bin/bash - - # Log all output to file. - exec > >(tee -a /var/log/clearwater-heat-sprout.log) 2>&1 - set -x - - # Configure the APT software source. - echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list - curl -L http://repo.cw-ngv.com/repo_key | apt-key add - - apt-get update - - # Get the public IP address from eth0 - sudo apt-get install ipcalc - ADDR=`ip addr show eth0 | awk '/inet /{print $2}'` - PUBLIC_ADDR=`ipcalc -n -b $ADDR | awk '/Address:/{print $2}'` - - # Configure /etc/clearwater/local_config. - mkdir -p /etc/clearwater - etcd_ip=__etcd_ip__ - [ -n "$etcd_ip" ] || etcd_ip=$PUBLIC_ADDR - cat > /etc/clearwater/local_config << EOF - management_local_ip=$PUBLIC_ADDR - local_ip=$PUBLIC_ADDR - public_ip=$PUBLIC_ADDR - public_hostname=__index__.sprout.__zone__ - etcd_cluster=$etcd_ip - EOF - - # Create /etc/chronos/chronos.conf. - mkdir -p /etc/chronos - cat > /etc/chronos/chronos.conf << EOF - [http] - bind-address = $PUBLIC_ADDR - bind-port = 7253 - threads = 50 - - [logging] - folder = /var/log/chronos - level = 2 - - [alarms] - enabled = true - - [exceptions] - max_ttl = 600 - EOF - - # Now install the software. - DEBIAN_FRONTEND=noninteractive apt-get install sprout-node --yes --force-yes - DEBIAN_FRONTEND=noninteractive apt-get install clearwater-management --yes --force-yes - - # Function to give DNS record type and IP address for specified IP address - ip2rr() { - if echo $1 | grep -q -e '[^0-9.]' ; then - echo AAAA $1 - else - echo A $1 - fi - } - - # Update DNS - retries=0 - while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF - server __dns_ip__ - update add sprout-__index__.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add __index__.sprout.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add sprout.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add scscf.sprout.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add icscf.sprout.__zone__. 30 $(ip2rr $PUBLIC_ADDR) - update add sprout.__zone__. 30 NAPTR 0 0 "s" "SIP+D2T" "" _sip._tcp.sprout.__zone__. - update add _sip._tcp.sprout.__zone__. 30 SRV 0 0 5054 __index__.sprout.__zone__. - update add icscf.sprout.__zone__. 30 NAPTR 0 0 "s" "SIP+D2T" "" _sip._tcp.icscf.sprout.__zone__. - update add _sip._tcp.icscf.sprout.__zone__. 30 SRV 0 0 5052 __index__.sprout.__zone__. - update add scscf.sprout.__zone__. 30 NAPTR 0 0 "s" "SIP+D2T" "" _sip._tcp.scscf.sprout.__zone__. - update add _sip._tcp.scscf.sprout.__zone__. 30 SRV 0 0 5054 __index__.sprout.__zone__. - send - EOF - } && [ $retries -lt 10 ] - do - retries=$((retries + 1)) - echo 'nsupdate failed - retrying (retry '$retries')...' - sleep 5 - done - - # Use the DNS server. - echo 'nameserver __dns_ip__' > /etc/dnsmasq.resolv.conf - echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq - service dnsmasq force-reload - -outputs: - public_ip: - description: IP address in public network - value: { get_attr: [ server, accessIPv4 ] } diff --git a/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.env b/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.env index aad4784b..e81afa70 100644 --- a/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.env +++ b/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.env @@ -32,3 +32,4 @@ hc2vpp_source_repo_branch: stable/1704 vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch hc2vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch + libevel_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch diff --git a/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml b/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml index 4f12c64e..ecdb1b1b 100644 --- a/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml +++ b/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml @@ -165,6 +165,10 @@ parameters: type: string label: Honeycomb Patch URL description: URL for Honeycomb patch for vG-MUX + libevel_patch_url: + type: string + label: libevel Patch URL + description: URL for libevel patch for vG-MUX ############# # # @@ -245,6 +249,7 @@ resources: __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } __vpp_patch_url__ : { get_param: vpp_patch_url } __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url } + __libevel_patch_url__ : { get_param: libevel_patch_url } template: | #!/bin/bash @@ -267,6 +272,7 @@ resources: echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt echo "__hc2vpp_patch_url__" > /opt/config/hc2vpp_patch_url.txt + echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gmux_install.sh -o /opt/v_gmux_install.sh diff --git a/robot/assets/asdc/base_vfw/base_vfw.yaml b/robot/assets/asdc/base_vfw/base_vfw.yaml index a7df854a..1c22c9b7 100644 --- a/robot/assets/asdc/base_vfw/base_vfw.yaml +++ b/robot/assets/asdc/base_vfw/base_vfw.yaml @@ -1,6 +1,36 @@ +########################################################################## +# +#==================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 deploy vFirewall demo app for OpenECOMP +description: Heat template that deploys vFirewall demo app for ONAP + +############## +# # +# PARAMETERS # +# # +############## parameters: vfw_image_name: @@ -23,14 +53,14 @@ parameters: type: string label: Protected private network name or ID description: Private network that connects vFirewall with vSink - ecomp_private_net_id: + onap_private_net_id: type: string - label: ECOMP management network name or ID - description: Private network that connects ECOMP component and the VNF - ecomp_private_subnet_id: + label: ONAP management network name or ID + description: Private network that connects ONAP components and the VNF + onap_private_subnet_id: type: string - label: ECOMP management sub-network name or ID - description: Private sub-network that connects ECOMP component and the VNF + label: ONAP management sub-network name or ID + description: Private sub-network that connects ONAP components and the VNF unprotected_private_net_cidr: type: string label: Unprotected private network CIDR @@ -39,9 +69,9 @@ parameters: type: string label: Protected private network CIDR description: The CIDR of the protected private network - ecomp_private_net_cidr: + onap_private_net_cidr: type: string - label: ECOMP private network CIDR + label: ONAP private network CIDR description: The CIDR of the protected private network vfw_private_ip_0: type: string @@ -53,24 +83,24 @@ parameters: description: Private IP address that is assigned to the vFirewall to communicate with the vSink vfw_private_ip_2: type: string - label: vFirewall private IP address towards the ECOMP management network - description: Private IP address that is assigned to the vFirewall to communicate with ECOMP components + label: vFirewall private IP address towards the ONAP management network + description: Private IP address that is assigned to the vFirewall to communicate with ONAP components vpg_private_ip_0: type: string label: vPacketGenerator private IP address towards the unprotected network description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall vpg_private_ip_1: type: string - label: vPacketGenerator private IP address towards the ECOMP management network - description: Private IP address that is assigned to the vPacketGenerator to communicate with ECOMP components + label: vPacketGenerator private IP address towards the ONAP management network + description: Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components vsn_private_ip_0: type: string label: vSink private IP address towards the protected network description: Private IP address that is assigned to the vSink to communicate with the vFirewall vsn_private_ip_1: type: string - label: vSink private IP address towards the ECOMP management network - description: Private IP address that is assigned to the vSink to communicate with ECOMP components + label: vSink private IP address towards the ONAP management network + description: Private IP address that is assigned to the vSink to communicate with ONAP components vfw_name_0: type: string label: vFirewall name @@ -86,11 +116,11 @@ parameters: vnf_id: type: string label: VNF ID - description: The VNF ID is provided by ECOMP + description: The VNF ID is provided by ONAP vf_module_id: type: string label: vFirewall module ID - description: The vFirewall Module ID is provided by ECOMP + description: The vFirewall Module ID is provided by ONAP dcae_collector_ip: type: string label: DCAE collector IP address @@ -115,13 +145,26 @@ parameters: type: string label: Repository URL description: URL of the repository that hosts the demo packages + install_script_version: + type: string + label: Installation script version number + description: Version number of the scripts that install 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 + cloud_env: + type: string + label: Cloud environment + description: Cloud environment (e.g., openstack, rackspace) + +############# +# # +# RESOURCES # +# # +############# resources: - random-str: type: OS::Heat::RandomString properties: @@ -130,12 +173,12 @@ resources: my_keypair: type: OS::Nova::KeyPair properties: - name: + name: str_replace: template: base_rand params: base: { get_param: key_name } - rand: { get_resource: random-str } + rand: { get_resource: random-str } public_key: { get_param: pub_key } save_private_key: false @@ -161,6 +204,26 @@ resources: network_id: { get_resource: protected_private_network } cidr: { get_param: protected_private_net_cidr } + # Virtual Firewall instantiation + vfw_private_0_port: + type: OS::Neutron::Port + properties: + network: { get_resource: unprotected_private_network } + fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}] + + vfw_private_1_port: + type: OS::Neutron::Port + properties: + allowed_address_pairs: [{ "ip_address": { get_param: vpg_private_ip_0 }}] + network: { get_resource: protected_private_network } + fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}] + + vfw_private_2_port: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_2 }}] + vfw_0: type: OS::Nova::Server properties: @@ -183,87 +246,52 @@ resources: __repo_url_blob__ : { get_param: repo_url_blob } __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } + __install_script_version__ : { get_param: install_script_version } + __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 } + __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 } + __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 } + __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } + __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } + __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } + __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash - DCAE_COLLECTOR_IP=__dcae_collector_ip__ - DCAE_COLLECTOR_PORT=__dcae_collector_port__ - REPO_URL_BLOB=__repo_url_blob__ - REPO_URL_ARTIFACTS=__repo_url_artifacts__ - DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__ - - # Download required dependencies - add-apt-repository -y ppa:openjdk-r/ppa - apt-get update - apt-get install -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates - apt-get install -y maven - pip install jsonschema - - # Download vFirewall code for virtual firewall + # Create configuration files mkdir /opt/config - mkdir /opt/honeycomb + echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt + echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.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 "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt + echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt + echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt + echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt + echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + + # Download and run install script + curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh cd /opt - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_firewall_init.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vfirewall.sh + chmod +x v_firewall_install.sh + ./v_firewall_install.sh - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf:sample-distribution:$DEMO_ARTIFACTS_VERSION:tar.gz:hc -Dtransitive=false -Ddest=. - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.ves:ves:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=. - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.ves:ves_vfw_reporting:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=. - - tar -zxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz - mv ves-$DEMO_ARTIFACTS_VERSION VES - tar -zxvf ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz - mv ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vFW - tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz - mv sample-distribution-$DEMO_ARTIFACTS_VERSION honeycomb - sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' honeycomb/sample-distribution-$DEMO_ARTIFACTS_VERSION/config/honeycomb.json - mv VESreporting_vFW /opt/VES/code/evel_training/VESreporting - rm *.tar.gz - chmod +x v_firewall_init.sh - chmod +x vfirewall.sh - echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt - echo $DCAE_COLLECTOR_PORT > config/dcae_collector_port.txt - echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt - - # Install VPP - export UBUNTU="trusty" - export RELEASE=".stable.1609" - rm /etc/apt/sources.list.d/99fd.io.list - echo "deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io$RELEASE.ubuntu.$UBUNTU.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list - apt-get update - apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev - sleep 1 - - # Install VES - cd /opt/VES/bldjobs/ - make clean - make - sleep 1 - - # Run instantiation script - cd /opt - mv vfirewall.sh /etc/init.d - update-rc.d vfirewall.sh defaults - ./v_firewall_init.sh - - vfw_private_0_port: + # Virtual Packet Generator instantiation + vpg_private_0_port: type: OS::Neutron::Port properties: network: { get_resource: unprotected_private_network } - fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}] - - vfw_private_1_port: - type: OS::Neutron::Port - properties: - network: { get_resource: protected_private_network } - fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}] + fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}] - vfw_private_2_port: + vpg_private_1_port: type: OS::Neutron::Port properties: - network: { get_param: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_2 }}] + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_1 }}] vpg_0: type: OS::Nova::Server @@ -287,75 +315,49 @@ resources: __repo_url_blob__ : { get_param: repo_url_blob } __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } + __install_script_version__ : { get_param: install_script_version } + __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 } + __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 } + __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } + __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } + __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash - FW_IPADDR=__fw_ipaddr__ - PROTECTED_NET_CIDR=__protected_net_cidr__ - SINK_IPADDR=__sink_ipaddr__ - REPO_URL_BLOB=__repo_url_blob__ - REPO_URL_ARTIFACTS=__repo_url_artifacts__ - DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__ - - # Download required dependencies - add-apt-repository -y ppa:openjdk-r/ppa - apt-get update - apt-get install -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates - apt-get install -y maven - pip install jsonschema - - # Download vFirewall demo code for packet generator + # Create configuration files mkdir /opt/config - mkdir /opt/honeycomb + echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt + echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt + echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.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 "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt + echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt + echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + + # Download and run install script + curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh cd /opt - - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_packetgen_init.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vpacketgen.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/run_traffic_fw_demo.sh - - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf:sample-distribution:$DEMO_ARTIFACTS_VERSION:tar.gz:hc -Dtransitive=false -Ddest=. - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.vfw:vfw_pg_streams:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=. + chmod +x v_packetgen_install.sh + ./v_packetgen_install.sh - tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz - tar -zxvf vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz - mv vfw_pg_streams-$DEMO_ARTIFACTS_VERSION pg_streams - mv sample-distribution-$DEMO_ARTIFACTS_VERSION honeycomb - sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' honeycomb/sample-distribution-$DEMO_ARTIFACTS_VERSION/config/honeycomb.json - rm *.tar.gz - chmod +x v_packetgen_init.sh - chmod +x vpacketgen.sh - echo $FW_IPADDR > config/fw_ipaddr.txt - echo $PROTECTED_NET_CIDR > config/protected_net_cidr.txt - echo $SINK_IPADDR > config/sink_ipaddr.txt - echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt - - # Install VPP - export UBUNTU="trusty" - export RELEASE=".stable.1609" - rm /etc/apt/sources.list.d/99fd.io.list - echo "deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io$RELEASE.ubuntu.$UBUNTU.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list - apt-get update - apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev - sleep 1 - - # Run instantiation script - cd /opt - mv vpacketgen.sh /etc/init.d - update-rc.d vpacketgen.sh defaults - ./v_packetgen_init.sh - - vpg_private_0_port: + # Virtual Sink instantiation + vsn_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: unprotected_private_network } - fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}] + network: { get_resource: protected_private_network } + fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}] - vpg_private_1_port: + vsn_private_1_port: type: OS::Neutron::Port properties: - network: { get_param: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_1 }}] + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vsn_private_ip_1 }}] vsn_0: type: OS::Nova::Server @@ -377,47 +379,29 @@ resources: __unprotected_net__: { get_param: unprotected_private_net_cidr } __repo_url_blob__ : { get_param: repo_url_blob } __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } + __install_script_version__ : { get_param: install_script_version } + __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 } + __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 } + __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } + __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } + __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash - PROTECTED_NET_GW=__protected_net_gw__ - UNPROTECTED_NET=__unprotected_net__ - UNPROTECTED_NET=$(echo $UNPROTECTED_NET | cut -d'/' -f1) - REPO_URL_BLOB=__repo_url_blob__ - REPO_URL_ARTIFACTS=__repo_url_artifacts__ - DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__ - - # Download required dependencies - add-apt-repository -y ppa:openjdk-r/ppa - apt-get update - apt-get install -y make wget openjdk-8-jdk apt-transport-https ca-certificates darkstat - - # Configure and run darkstat - sed -i "s/START_DARKSTAT=.*/START_DARKSTAT=yes/g" /etc/darkstat/init.cfg - sed -i "s/INTERFACE=.*/INTERFACE=\"-i eth1\"/g" /etc/darkstat/init.cfg - /etc/init.d/darkstat start - + # Create configuration files mkdir /opt/config + echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt + echo "__unprotected_net__" > /opt/config/unprotected_net.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt + echo "__install_script_version__" > /opt/config/install_script_version.txt + echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt + echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt + echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + + # Download and run install script + curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh cd /opt - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_sink_init.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vsink.sh - chmod +x v_sink_init.sh - chmod +x vsink.sh - echo $PROTECTED_NET_GW > config/protected_net_gw.txt - echo $UNPROTECTED_NET > config/unprotected_net.txt - mv vsink.sh /etc/init.d - update-rc.d vsink.sh defaults - ./v_sink_init.sh - - vsn_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: protected_private_network } - fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}] - - vsn_private_1_port: - type: OS::Neutron::Port - properties: - network: { get_param: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vsn_private_ip_1 }}] + chmod +x v_sink_install.sh + ./v_sink_install.sh
\ No newline at end of file diff --git a/robot/assets/asdc/base_vlb/base_vlb.yaml b/robot/assets/asdc/base_vlb/base_vlb.yaml index c292f295..4a94b218 100644 --- a/robot/assets/asdc/base_vlb/base_vlb.yaml +++ b/robot/assets/asdc/base_vlb/base_vlb.yaml @@ -1,6 +1,36 @@ +########################################################################## +# +#==================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 deploy vLoadBalancer/vDNS demo app for OpenECOMP +description: Heat template to deploy vLoadBalancer/vDNS demo app for ONAP + +############## +# # +# PARAMETERS # +# # +############## parameters: vlb_image_name: @@ -19,21 +49,29 @@ parameters: type: string label: vLoadBalancer private network name or ID description: Private network that connects vLoadBalancer with vDNSs - ecomp_private_net_id: + pktgen_private_net_id: + type: string + label: vPacketGen private network name or ID + description: Private network that connects vLoadBalancer with vPacketGen + onap_private_net_id: type: string label: ECOMP management network name or ID - description: Private network that connects ECOMP component and the VNF - ecomp_private_subnet_id: + description: Private network that connects ONAP component and the VNF + onap_private_subnet_id: type: string label: ECOMP management sub-network name or ID - description: Private sub-network that connects ECOMP component and the VNF + description: Private sub-network that connects ONAP component and the VNF vlb_private_net_cidr: type: string label: vLoadBalancer private network CIDR description: The CIDR of the vLoadBalancer private network - ecomp_private_net_cidr: + pktgen_private_net_cidr: type: string - label: ECOMP private network CIDR + label: vPacketGen private network CIDR + description: The CIDR of the vPacketGen private network + onap_private_net_cidr: + type: string + label: ONAP private network CIDR description: The CIDR of the protected private network vlb_private_ip_0: type: string @@ -41,16 +79,40 @@ parameters: description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs vlb_private_ip_1: type: string - label: vLoadBalancer private IP address towards the ECOMP management network - description: Private IP address that is assigned to the vLoadBalancer to communicate with ECOMP components + label: vLoadBalancer private IP address towards the ONAP management network + description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components + vlb_private_ip_2: + type: string + label: vLoadBalancer private IP address towards the vPacketGen network + description: Private IP address that is assigned to the vLoadBalancer to communicate with vPacketGen vdns_private_ip_0: type: string label: vDNS private IP address towards the private network description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer vdns_private_ip_1: type: string - label: vDNS private IP address towards the ECOMP management network - description: Private IP address that is assigned to the vDNS to communicate with ECOMP components + label: vDNS private IP address towards the ONAP management network + description: Private IP address that is assigned to the vDNS to communicate with ONAP components + vpg_private_ip_0: + type: string + label: vPacketGen private IP address towards the vPacketGen private network + description: Private IP address that is assigned to the vPacketGen to communicate with the vLoadBalancer + vpg_private_ip_1: + type: string + label: vPacketGen private IP address towards the ONAP management network + description: Private IP address that is assigned to the vPacketGen to communicate with ONAP components + vip: + type: string + label: Virtual Private IP of the vLoadBalancer + description: Virtual Private IP that is assigned to the vLoadBalancer's VPP layer + gre_ipaddr: + type: string + label: IP Address of the GRE tunnel + description: IP address assigned to the GRE tunnel on the vLoadBalancer + pg_int: + type: string + label: IP Address of the output vPacketGen interface + description: IP address assigned to the output interface of the vPacketGen's VPP layer vlb_name_0: type: string label: vLoadBalancer name @@ -59,14 +121,18 @@ parameters: type: string label: vDNS name description: Name of the vDNS + vpg_name_0: + type: string + label: vPKTGEN name + description: Name of the vPKTGEN vnf_id: type: string label: VNF ID - description: The VNF ID is provided by ECOMP + description: The VNF ID is provided by ONAP vf_module_id: type: string label: vFirewall module ID - description: The vLoadBalancer Module ID is provided by ECOMP + description: The vLoadBalancer Module ID is provided by ONAP dcae_collector_ip: type: string label: DCAE collector IP address @@ -95,6 +161,20 @@ parameters: type: string label: Artifacts version used in demo vnfs description: Artifacts (jar, tar.gz) version used in demo vnfs + install_script_version: + type: string + label: Installation script version number + description: Version number of the scripts that install the vFW demo app + cloud_env: + type: string + label: Cloud environment + description: Cloud environment (e.g., openstack, rackspace) + +############# +# # +# RESOURCES # +# # +############# resources: @@ -102,16 +182,16 @@ resources: type: OS::Heat::RandomString properties: length: 4 - + my_keypair: type: OS::Nova::KeyPair properties: - name: + name: str_replace: template: base_rand params: base: { get_param: key_name } - rand: { get_resource: random-str } + rand: { get_resource: random-str } public_key: { get_param: pub_key } save_private_key: false @@ -127,6 +207,36 @@ resources: network_id: { get_resource: vlb_private_network } cidr: { get_param: vlb_private_net_cidr } + pktgen_private_network: + type: OS::Neutron::Net + properties: + name: { get_param: pktgen_private_net_id } + + pktgen_private_subnet: + type: OS::Neutron::Subnet + properties: + name: { get_param: pktgen_private_net_id } + network_id: { get_resource: pktgen_private_network } + cidr: { get_param: pktgen_private_net_cidr } + + vlb_private_0_port: + type: OS::Neutron::Port + properties: + network: { get_resource: vlb_private_network } + fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vlb_private_ip_0 }}] + + vlb_private_1_port: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vlb_private_ip_1 }}] + + vlb_private_2_port: + type: OS::Neutron::Port + properties: + network: { get_resource: pktgen_private_network } + fixed_ips: [{"subnet": { get_resource: pktgen_private_subnet }, "ip_address": { get_param: vlb_private_ip_2 }}] + vlb_0: type: OS::Nova::Server properties: @@ -138,6 +248,7 @@ resources: - network: { get_param: public_net_id } - port: { get_resource: vlb_private_0_port } - port: { get_resource: vlb_private_1_port } + - port: { get_resource: vlb_private_2_port } metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} user_data_format: RAW user_data: @@ -145,100 +256,62 @@ resources: params: __dcae_collector_ip__: { get_param: dcae_collector_ip } __dcae_collector_port__: { get_param: dcae_collector_port } - __local_private_ipaddr__: { get_param: vlb_private_ip_0 } - __repo_url_blob__ : { get_param: repo_url_blob } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } + __ip_to_dns_net__: { get_param: vlb_private_ip_0 } + __ip_to_pktgen_net__: { get_param: vlb_private_ip_2 } + __vip__: { get_param: vip } + __gre_ipaddr__: { get_param: gre_ipaddr } + __pktgen_ipaddr__: { get_param: vpg_private_ip_0 } + __oam_private_ipaddr__: { get_param: vlb_private_ip_1 } + __repo_url_blob__: { get_param: repo_url_blob } + __repo_url_artifacts__: { get_param: repo_url_artifacts } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } + __onap_private_net_cidr__: { get_param: onap_private_net_cidr } + __pktgen_private_net_cidr__: { get_param: pktgen_private_net_cidr } + __pktgen_mac__: { get_attr: [vpg_private_0_port, mac_address] } + __cloud_env__: { get_param: cloud_env } template: | #!/bin/bash - DCAE_COLLECTOR_IP=__dcae_collector_ip__ - DCAE_COLLECTOR_PORT=__dcae_collector_port__ - LOCAL_PRIVATE_IPADDR=__local_private_ipaddr__ - REPO_URL_BLOB=__repo_url_blob__ - REPO_URL_ARTIFACTS=__repo_url_artifacts__ - DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__ - - # Download required dependencies - add-apt-repository -y ppa:openjdk-r/ppa - apt-get update - apt-get install -y make gcc wget openjdk-8-jdk bridge-utils libcurl4-openssl-dev apt-transport-https ca-certificates - apt-get install -y maven - sleep 1 - - # Download vLB demo code for load balancer + # Create configuration files mkdir /opt/config - mkdir /opt/FDserver + echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt + echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt + echo "__ip_to_dns_net__" > /opt/config/ip_to_dns_net.txt + echo "__ip_to_pktgen_net__" > /opt/config/ip_to_pktgen_net.txt + echo "__vip__" > /opt/config/vip.txt + echo "__gre_ipaddr__" > /opt/config/gre_ipaddr.txt + echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt + echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.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 "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt + echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__pktgen_mac__" > /opt/config/pktgen_mac.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + + # Download and run install script + curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_lb_install.sh -o /opt/v_lb_install.sh cd /opt + chmod +x v_lb_install.sh + ./v_lb_install.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/v_lb_init.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/vlb.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/dnsmembership.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/add_dns.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/remove_dns.sh - - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.vlb:dns-manager:$DEMO_ARTIFACTS_VERSION:jar -Dtransitive=false -Ddest=. - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.ves:ves:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=. - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.ves:ves_vlb_reporting:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=. - - tar -zxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz - mv ves-$DEMO_ARTIFACTS_VERSION VES - tar -zxvf ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz - mv ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vLB - - mv VESreporting_vLB /opt/VES/code/evel_training/VESreporting - mv dns-manager-$DEMO_ARTIFACTS_VERSION.jar /opt/FDserver/dns-manager-$DEMO_ARTIFACTS_VERSION.jar - mv dnsmembership.sh /opt/FDserver/dnsmembership.sh - mv add_dns.sh /opt/FDserver/add_dns.sh - mv remove_dns.sh /opt/FDserver/remove_dns.sh - rm *.tar.gz - - chmod +x v_lb_init.sh - chmod +x vlb.sh - chmod +x /opt/VES/code/evel_training/VESreporting/go-client.sh - chmod +x /opt/FDserver/dnsmembership.sh - chmod +x /opt/FDserver/add_dns.sh - chmod +x /opt/FDserver/remove_dns.sh - echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt - echo $DCAE_COLLECTOR_PORT > config/dcae_collector_port.txt - echo $LOCAL_PRIVATE_IPADDR > config/local_private_ipaddr.txt - LOCAL_PUBLIC_IPADDR=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) - echo $LOCAL_PUBLIC_IPADDR > config/local_public_ipaddr.txt - echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt - - # Install VPP - export UBUNTU="trusty" - export RELEASE=".stable.1609" - rm /etc/apt/sources.list.d/99fd.io.list - echo "deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io$RELEASE.ubuntu.$UBUNTU.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list - apt-get update - apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev - sleep 1 - - # Install VES - cd /opt/VES/bldjobs/ - make clean - make - sleep 1 - - # Run instantiation script - cd /opt - mv vlb.sh /etc/init.d - update-rc.d vlb.sh defaults - ./v_lb_init.sh - - vlb_private_0_port: + vdns_private_0_port: type: OS::Neutron::Port properties: network: { get_resource: vlb_private_network } - fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vlb_private_ip_0 }}] + fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}] - vlb_private_1_port: + vdns_private_1_port: type: OS::Neutron::Port properties: - network: { get_param: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vlb_private_ip_1 }}] + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] vdns_0: type: OS::Nova::Server @@ -256,84 +329,100 @@ resources: user_data: str_replace: params: - __lb_oam_int__ : { get_param: vlb_private_ip_1 } + __lb_oam_int__: { get_param: vlb_private_ip_1 } __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } __local_private_ipaddr__: { get_param: vdns_private_ip_0 } - __repo_url_blob__ : { get_param: repo_url_blob } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } + __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } + __repo_url_blob__: { get_param: repo_url_blob } + __repo_url_artifacts__: { get_param: repo_url_artifacts } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } + __onap_private_net_cidr__: { get_param: onap_private_net_cidr } + __cloud_env__: { get_param: cloud_env } template: | #!/bin/bash - LB_OAM_INT=__lb_oam_int__ - LB_PRIVATE_IPADDR=__lb_private_ipaddr__ - LOCAL_PRIVATE_IPADDR=__local_private_ipaddr__ - REPO_URL_BLOB=__repo_url_blob__ - REPO_URL_ARTIFACTS=__repo_url_artifacts__ - DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__ - - # Download required dependencies - add-apt-repository -y ppa:openjdk-r/ppa - apt-get update - apt-get install -y wget openjdk-8-jdk bind9 bind9utils bind9-doc apt-transport-https ca-certificates - apt-get install -y maven - sleep 1 - - # Download vDNS demo code for DNS Server + # Create configuration files mkdir /opt/config - mkdir /opt/FDclient + echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt + echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt + echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt + echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.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 "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + + # Download and run install script + curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh cd /opt - - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/v_dns_init.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/vdns.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/dnsclient.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/set_gre_tunnel.sh - - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.vlb:dns-client:$DEMO_ARTIFACTS_VERSION:jar -Dtransitive=false -Ddest=. - - mv dns-client-$DEMO_ARTIFACTS_VERSION.jar /opt/FDclient/ - mv dnsclient.sh /opt/FDclient/ - mv set_gre_tunnel.sh /opt/FDclient/ - - chmod +x v_dns_init.sh - chmod +x vdns.sh - chmod +x /opt/FDclient/dnsclient.sh - chmod +x /opt/FDclient/set_gre_tunnel.sh - - echo $LB_OAM_INT > config/lb_oam_int.txt - echo $LB_PRIVATE_IPADDR > config/lb_private_ipaddr.txt - echo $LOCAL_PRIVATE_IPADDR > config/local_private_ipaddr.txt - echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt + chmod +x v_dns_install.sh + ./v_dns_install.sh - # Download Bind config files - cd /opt/config - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/db_dnsdemo_openecomp_org - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/named.conf.options - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/named.conf.local - # Configure Bind - modprobe ip_gre - mkdir /etc/bind/zones - sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9 - mv db_dnsdemo_openecomp_org /etc/bind/zones/db.dnsdemo.openecomp.org - mv named.conf.options /etc/bind/ - mv named.conf.local /etc/bind/ - sleep 1 - - # Run instantiation script - cd /opt - mv vdns.sh /etc/init.d - update-rc.d vdns.sh defaults - ./v_dns_init.sh - - vdns_private_0_port: + vpg_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: vlb_private_network } - fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}] + network: { get_resource: pktgen_private_network } + fixed_ips: [{"subnet": { get_resource: pktgen_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}] - vdns_private_1_port: + vpg_private_1_port: type: OS::Neutron::Port properties: - network: { get_param: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_1 }}] + + vpg_0: + type: OS::Nova::Server + properties: + image: { get_param: vlb_image_name } + flavor: { get_param: vlb_flavor_name } + name: { get_param: vpg_name_0 } + key_name: { get_resource: my_keypair } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: vpg_private_0_port } + - port: { get_resource: vpg_private_1_port } + user_data_format: RAW + user_data: + str_replace: + params: + __repo_url_blob__: { get_param: repo_url_blob } + __repo_url_artifacts__: { get_param: repo_url_artifacts } + __local_private_ipaddr__: { get_param: vpg_private_ip_0 } + __oam_private_ipaddr__: { get_param: vpg_private_ip_1 } + __onap_private_net_cidr__: { get_param: onap_private_net_cidr } + __pktgen_private_net_cidr__: { get_param: pktgen_private_net_cidr } + __vlb_ipaddr__: { get_param: vlb_private_ip_2 } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __pg_int__: { get_param: pg_int } + __vlb_mac__: { get_attr: [vlb_private_2_port, mac_address] } + __cloud_env__: { get_param: cloud_env } + template: | + #!/bin/bash + + # Create configuration files + mkdir /opt/config + echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt + echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt + echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.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 "__pg_int__" > /opt/config/pg_int.txt + echo "__vlb_mac__" > /opt/config/vlb_mac.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + + # Download and run install script + curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh + cd /opt + chmod +x v_packetgen_install.sh + ./v_packetgen_install.sh
\ No newline at end of file diff --git a/robot/assets/asdc/base_vlb/dnsscaling.yaml b/robot/assets/asdc/base_vlb/dnsscaling.yaml index 003deb91..856df1a4 100644 --- a/robot/assets/asdc/base_vlb/dnsscaling.yaml +++ b/robot/assets/asdc/base_vlb/dnsscaling.yaml @@ -1,6 +1,36 @@ +########################################################################## +# +#==================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 deploy a vDNS for OpenECOMP (scaling-up scenario) +description: Heat template to deploy a vDNS for ONAP (scaling-up scenario) + +############## +# # +# PARAMETERS # +# # +############## parameters: vlb_image_name: @@ -19,30 +49,38 @@ parameters: type: string label: vLoadBalancer private network name or ID description: Private network that connects vLoadBalancer with vDNSs - ecomp_private_net_id: + onap_private_net_id: + type: string + label: ONAP management network name or ID + description: Private network that connects ONAP component and the VNF + onap_private_subnet_id: type: string - label: ECOMP management network name or ID - description: Private network that connects ECOMP component and the VNF - ecomp_private_subnet_id: + label: ONAP management sub-network name or ID + description: Private sub-network that connects ONAP component and the VNF + vlb_private_net_cidr: type: string - label: ECOMP management sub-network name or ID - description: Private sub-network that connects ECOMP component and the VNF + label: vLoadBalancer private network CIDR + description: The CIDR of the vLoadBalancer private network + onap_private_net_cidr: + type: string + label: ONAP private network CIDR + description: The CIDR of the protected private network vlb_private_ip_0: type: string label: vLoadBalancer private IP address towards the private network description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs vlb_private_ip_1: type: string - label: vLoadBalancer private IP address towards the ECOMP management network - description: Private IP address that is assigned to the vLoadBalancer to communicate with ECOMP components + label: vLoadBalancer private IP address towards the ONAP management network + description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components vdns_private_ip_0: type: string label: vDNS private IP address towards the private network description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer vdns_private_ip_1: type: string - label: vDNS private IP address towards the ECOMP management network - description: Private IP address that is assigned to the vDNS to communicate with ECOMP components + label: vDNS private IP address towards the ONAP management network + description: Private IP address that is assigned to the vDNS to communicate with ONAP components vdns_name_0: type: string label: vDNS name @@ -50,11 +88,11 @@ parameters: vnf_id: type: string label: VNF ID - description: The VNF ID is provided by ECOMP + description: The VNF ID is provided by ONAP vf_module_id: type: string label: vFirewall module ID - description: The vLoadBalancer Module ID is provided by ECOMP + description: The vLoadBalancer Module ID is provided by ONAP key_name: type: string label: Key pair name @@ -71,10 +109,24 @@ parameters: type: string label: Repository URL description: URL of the repository that hosts the demo packages + install_script_version: + type: string + label: Installation script version number + description: Version number of the scripts that install 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 + cloud_env: + type: string + label: Cloud environment + description: Cloud environment (e.g., openstack, rackspace) + +############# +# # +# RESOURCES # +# # +############# resources: @@ -95,7 +147,19 @@ resources: public_key: { get_param: pub_key } save_private_key: false - vdns_0: + vdns_2_private_0_port: + type: OS::Neutron::Port + properties: + network: { get_param: vlb_private_net_id } + fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}] + + vdns_2_private_1_port: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] + + vdns_2: type: OS::Nova::Server properties: image: { get_param: vlb_image_name } @@ -104,91 +168,43 @@ resources: key_name: { get_resource: my_keypair } networks: - network: { get_param: public_net_id } - - port: { get_resource: vdns_private_0_port } - - port: { get_resource: vdns_private_1_port } + - port: { get_resource: vdns_2_private_0_port } + - port: { get_resource: vdns_2_private_1_port } metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} user_data_format: RAW user_data: str_replace: params: - __lb_oam_int__ : { get_param: vlb_private_ip_1 } + __lb_oam_int__: { get_param: vlb_private_ip_1 } __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } __local_private_ipaddr__: { get_param: vdns_private_ip_0 } - __repo_url_blob__ : { get_param: repo_url_blob } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } + __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } + __repo_url_blob__: { get_param: repo_url_blob } + __repo_url_artifacts__: { get_param: repo_url_artifacts } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } + __onap_private_net_cidr__: { get_param: onap_private_net_cidr } + __cloud_env__: { get_param: cloud_env } template: | #!/bin/bash - LB_OAM_INT=__lb_oam_int__ - LB_PRIVATE_IPADDR=__lb_private_ipaddr__ - LOCAL_PRIVATE_IPADDR=__local_private_ipaddr__ - REPO_URL_BLOB=__repo_url_blob__ - REPO_URL_ARTIFACTS=__repo_url_artifacts__ - DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__ - - # Download required dependencies - add-apt-repository -y ppa:openjdk-r/ppa - apt-get update - apt-get install -y wget openjdk-8-jdk bind9 bind9utils bind9-doc apt-transport-https ca-certificates - apt-get install -y maven - sleep 1 - - # Download vDNS demo code for DNS Server + # Create configuration files mkdir /opt/config - mkdir /opt/FDclient + echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt + echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt + echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt + echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.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 "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt + echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + + # Download and run install script + curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh cd /opt - - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/v_dns_init.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/vdns.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/dnsclient.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/set_gre_tunnel.sh - - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.vlb:dns-client:$DEMO_ARTIFACTS_VERSION:jar -Dtransitive=false -Ddest=. - - mv dns-client-$DEMO_ARTIFACTS_VERSION.jar /opt/FDclient/ - mv dnsclient.sh /opt/FDclient/ - mv set_gre_tunnel.sh /opt/FDclient/ - - chmod +x v_dns_init.sh - chmod +x vdns.sh - chmod +x /opt/FDclient/dnsclient.sh - chmod +x /opt/FDclient/set_gre_tunnel.sh - - echo $LB_OAM_INT > config/lb_oam_int.txt - echo $LB_PRIVATE_IPADDR > config/lb_private_ipaddr.txt - echo $LOCAL_PRIVATE_IPADDR > config/local_private_ipaddr.txt - echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt - - # Download Bind config files - cd /opt/config - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/db_dnsdemo_openecomp_org - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/named.conf.options - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/named.conf.local - - # Configure Bind - modprobe ip_gre - mkdir /etc/bind/zones - sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9 - mv db_dnsdemo_openecomp_org /etc/bind/zones/db.dnsdemo.openecomp.org - mv named.conf.options /etc/bind/ - mv named.conf.local /etc/bind/ - sleep 1 - - # Run instantiation script - cd /opt - mv vdns.sh /etc/init.d - update-rc.d vdns.sh defaults - ./v_dns_init.sh - - vdns_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_param: vlb_private_net_id } - fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}] - - vdns_private_1_port: - type: OS::Neutron::Port - properties: - network: { get_param: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] + chmod +x v_dns_install.sh + ./v_dns_install.sh
\ No newline at end of file diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py index c1a5079b..badc5e57 100644 --- a/robot/assets/service_mappings.py +++ b/robot/assets/service_mappings.py @@ -4,7 +4,6 @@ This metadata identifies the folders to be zipped and uploaded to SDC for model GLOBAL_SERVICE_FOLDER_MAPPING = {"vFW" : ['base_vfw'], \ "vLB" : ['base_vlb'], \ "vVG" : ['base_vvg'], \ - "vIMS" : ['base_clearwater'], \ "vCPE" : ['base_vcpe_infra', 'base_vcpe_vbng', 'base_vcpe_vbrgemu', 'base_vcpe_vgmux', 'base_vcpe_vgw'], } @@ -19,7 +18,6 @@ GLOBAL_SERVICE_TEMPLATE_MAPPING = { "vLB" : [{"isBase" : "true", "template" : "vlb_preload.template", "name_pattern": "base_vlb"}, {"isBase" : "false", "template" : "dnsscaling_preload.template", "name_pattern": "dnsscaling", "prefix" : "vDNS_"}], "vVG" : [{"isBase" : "true", "template" : "vvg_preload.template", "name_pattern": "base_vvg"}], - "vIMS" : [{"isBase" : "true", "template" : "vims_preload.template", "name_pattern": "base_clearwater"}], "vCPE" : [{"isBase" : "true", "template" : "vcpe_preload.template", "name_pattern": "base_clearwater"}], } @@ -29,6 +27,5 @@ Used by the Heatbridge Validate Query to A&AI to locate the vserver name GLOBAL_VALIDATE_NAME_MAPPING = {"vFW" : 'vfw_name_0', "vLB" : 'vlb_name_0', "vVG" : '', - "vIMS" : '', "vCPE" : '', } diff --git a/robot/assets/templates/sdnc/preload.template b/robot/assets/templates/sdnc/preload.template index b2f4f088..327d806c 100644 --- a/robot/assets/templates/sdnc/preload.template +++ b/robot/assets/templates/sdnc/preload.template @@ -1,31 +1,33 @@ { - "input": { - "vnf-topology-information": { - "vnf-topology-identifier": { - "service-type": "${service_type}", - "vnf-name": "${vf_module_name}", - "vnf-type": "${vf_module_type}", - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}" - }, - "vnf-assignments": { - "availability-zones": [], - "vnf-networks": [], - "vnf-vms": [] - }, - "vnf-parameters": ${vnf_parameters} - }, - "request-information": { - "request-id": "robot12", - "order-version": "1", - "notification-url": "openecomp.org", - "order-number": "1", - "request-action": "PreloadVNFRequest" - }, - "sdnc-request-header": { - "svc-request-id": "robot12", - "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify", - "svc-action": "reserve" - } - } -}
\ No newline at end of file + "input": { + "request-information": { + "notification-url": "openecomp.org", + "order-number": "1", + "order-version": "1", + "request-action": "PreloadVNFRequest", + "request-id": "robot12" + }, + "sdnc-request-header": { + "svc-action": "reserve", + "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify", + "svc-request-id": "robot12" + }, + "vnf-topology-information": { + "vnf-assignments": { + "availability-zones": [], + "vnf-networks": [], + "vnf-vms": [] + }, + "vnf-parameters": + ${vnf_parameters} + , + "vnf-topology-identifier": { + "generic-vnf-name": "${generic_vnf_name}", + "generic-vnf-type": "${generic_vnf_type}", + "vnf-name": "${vf_module_name}", + "vnf-type": "${vf_module_type}", + "service-type": "${service_type}" + } + } + } +} diff --git a/robot/assets/templates/web/index.html.template b/robot/assets/templates/web/index.html.template index 4853fc72..db9c5ea0 100644 --- a/robot/assets/templates/web/index.html.template +++ b/robot/assets/templates/web/index.html.template @@ -25,15 +25,52 @@ <p> the password for all of them is: demo123456! + <h3>/etc/hosts or C:\Windows\system32\drivers\etc\hosts</h> + <pre> +${sdc} sdc.api.simpledemo.openecomp.org +${policy} policy.api.simpledemo.openecomp.org +${portal} portal.api.simpledemo.openecomp.org +${vid} vid.api.simpledemo.openecomp.org + </pre> + <h1> The Reality </h1> As everything should go through the portal there are many subsystems which have there own GUI or API which come in very handy when debugging things. Here the most important once. <h2> Testing </h2> - <b> Not working. </b> : - - <a href="http://${robot}:88/report.html"> Test Report </a> + <h3>Robot Logs</h3> + + <a href="http://${robot}:88/logs/"> Robot Logs </a> + + <h3>Robot vm_properties.py for local testing</h3> + <pre> +GLOBAL_INJECTED_ARTIFACTS_VERSION = "${GLOBAL_INJECTED_ARTIFACTS_VERSION}" +GLOBAL_INJECTED_GITLAB_PASSWORD = "password" +GLOBAL_INJECTED_GITLAB_USERNAME = "username" +GLOBAL_INJECTED_NETWORK = "${GLOBAL_INJECTED_NETWORK}" +GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "${GLOBAL_INJECTED_NEXUS_DOCKER_REPO}" +GLOBAL_INJECTED_NEXUS_PASSWORD = "password" +GLOBAL_INJECTED_NEXUS_REPO = "${GLOBAL_INJECTED_NEXUS_REPO}" +GLOBAL_INJECTED_NEXUS_USERNAME = "docker" +GLOBAL_INJECTED_OPENSTACK_API_KEY = "openstackapikey" +GLOBAL_INJECTED_OPENSTACK_PASSWORD = "openstackpass" +GLOBAL_INJECTED_OPENSTACK_USERNAME = "openstackuser" +GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}" +GLOBAL_INJECTED_REGION = "${GLOBAL_INJECTED_REGION}" +GLOBAL_INJECTED_KEYSTONE = "${GLOBAL_INJECTED_KEYSTONE}" +GLOBAL_INJECTED_AAI1_IP_ADDR = "${aai1}" +GLOBAL_INJECTED_AAI2_IP_ADDR = "${aai2}" +GLOBAL_INJECTED_APPC_IP_ADDR = "${appc}" +GLOBAL_INJECTED_DCAE_IP_ADDR = "${dcae_controller}" +GLOBAL_INJECTED_SO_IP_ADDR = "${mso}" +GLOBAL_INJECTED_MR_IP_ADDR = "${message_router}" +GLOBAL_INJECTED_POLICY_IP_ADDR = "${policy}" +GLOBAL_INJECTED_PORTAL_IP_ADDR = "${portal}" +GLOBAL_INJECTED_SDC_IP_ADDR = "${sdc}" +GLOBAL_INJECTED_SDNC_IP_ADDR = "${sdnc}" +GLOBAL_INJECTED_VID_IP_ADDR = "${vid}" + </pre> <h2> SDN-C </h2> @@ -99,7 +136,8 @@ The following links will open a shell and ssh to the various running VMs (at least on a Mac). It assumes that the .ssh/config file has been set appropriately and /etc/hosts has been updated to the running instance.<p> - <a href="ssh://${aai}"> AAI </a><p> + <a href="ssh://${aai1}"> AAI1 </a><p> + <a href="ssh://${aai2}"> AAI2 </a><p> <a href="ssh://${policy}"> Policy </a><p> <a href="ssh://${sdc}"> SDC </a><p> <a href="ssh://${portal}"> Portal </a><p> diff --git a/robot/resources/aaf_interface.robot b/robot/resources/aaf_interface.robot index 57d4aabc..c9245913 100644 --- a/robot/resources/aaf_interface.robot +++ b/robot/resources/aaf_interface.robot @@ -21,6 +21,7 @@ Run AAF Get Request [Arguments] ${data_path} ${auth}= Create List ${GLOBAL_AAF_USERNAME} ${GLOBAL_AAF_PASSWORD} ${session}= Create Session aaf ${GLOBAL_AAF_SERVER} auth=${auth} + ${session_client}= Add Client Cert ${session} cert ${uuid}= Generate UUID ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Get Request aaf ${data_path} headers=${headers} diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot index 74a78d45..c5ada099 100644 --- a/robot/testsuites/demo.robot +++ b/robot/testsuites/demo.robot @@ -2,6 +2,7 @@ Documentation Executes the VNF Orchestration Test cases including setup and teardown ... Library Collections +Library DatabaseLibrary Resource ../resources/demo_preload.robot *** Variables *** diff --git a/robot/testsuites/model-distribution.robot b/robot/testsuites/model-distribution.robot index 5f0c597d..ad51202d 100644 --- a/robot/testsuites/model-distribution.robot +++ b/robot/testsuites/model-distribution.robot @@ -18,7 +18,5 @@ Distribute vFW Model vFW [Tags] ete distribute Distribute vVG Model vVG [Tags] ete distribute -Distribute vIMS Model vIMS - [Tags] ete distribute Distribute vCPE Model vCPE [Tags] ete distribute
\ No newline at end of file diff --git a/robot/testsuites/update_onap_page.robot b/robot/testsuites/update_onap_page.robot index 2f8ca167..b8b0782c 100644 --- a/robot/testsuites/update_onap_page.robot +++ b/robot/testsuites/update_onap_page.robot @@ -29,19 +29,20 @@ Update ONAP Page ${server_map}= Get Openstack Servers auth ${oam_ip_map}= Create Dictionary Set To Dictionary ${oam_ip_map} 10.0.0.1=onapdns - Set To Dictionary ${oam_ip_map} 10.0.1.1=aai - Set To Dictionary ${oam_ip_map} 10.0.2.1=appc - Set To Dictionary ${oam_ip_map} 10.0.3.1=sdc - Set To Dictionary ${oam_ip_map} 10.0.4.1=dcae_controller + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_AAI1_IP_ADDR}=aai1 + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_AAI2_IP_ADDR}=aai2 + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_APPC_IP_ADDR}=appc + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_DCAE_IP_ADDR}=dcae_controller + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SO_IP_ADDR}=mso + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_MR_IP_ADDR}=message_router + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_POLICY_IP_ADDR}=policy + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_PORTAL_IP_ADDR}=portal + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SDC_IP_ADDR}=sdc + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SDNC_IP_ADDR}=sdnc + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_VID_IP_ADDR}=vid Set To Dictionary ${oam_ip_map} 10.0.4.105=dcae_cdap Set To Dictionary ${oam_ip_map} 10.0.4.102=dcae_coll - Set To Dictionary ${oam_ip_map} 10.0.5.1=mso - Set To Dictionary ${oam_ip_map} 10.0.6.1=policy - Set To Dictionary ${oam_ip_map} 10.0.7.1=sdnc - Set To Dictionary ${oam_ip_map} 10.0.8.1=vid - Set To Dictionary ${oam_ip_map} 10.0.9.1=portal Set To Dictionary ${oam_ip_map} 10.0.10.1=robot - Set To Dictionary ${oam_ip_map} 10.0.11.1=message_router ${values}= Create Dictionary ${keys}= Get Dictionary Keys ${oam_ip_map} @@ -50,6 +51,13 @@ Update ONAP Page \ Set Public Ip ${server_map} ${oam_ip} ${value_name} ${values} Log ${values} Run Keyword If '${WEB_PASSWORD}' != '' Create File ${CREDENTIALS_FILE} ${WEB_USER}:${WEB_PASSWORD} + Set To Dictionary ${values} GLOBAL_INJECTED_ARTIFACTS_VERSION=${GLOBAL_INJECTED_ARTIFACTS_VERSION} + Set To Dictionary ${values} GLOBAL_INJECTED_NETWORK=${GLOBAL_INJECTED_NETWORK} + Set To Dictionary ${values} GLOBAL_INJECTED_NEXUS_DOCKER_REPO=${GLOBAL_INJECTED_NEXUS_DOCKER_REPO} + Set To Dictionary ${values} GLOBAL_INJECTED_NEXUS_REPO=${GLOBAL_INJECTED_NEXUS_REPO} + Set To Dictionary ${values} GLOBAL_INJECTED_OPENSTACK_TENANT_ID=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} + Set To Dictionary ${values} GLOBAL_INJECTED_REGION=${GLOBAL_INJECTED_REGION} + Set To Dictionary ${values} GLOBAL_INJECTED_KEYSTONE=${GLOBAL_INJECTED_KEYSTONE} Create File From Template ${URLS_HTML_TEMPLATE} ${URLS_HTML} ${values} *** Keywords *** @@ -80,6 +88,8 @@ Search Addresses Return From Keyword If '${status}'=='PASS' ${public_ip} ${status} ${public_ip}= Run Keyword And Ignore Error Find Openstack ${addresses} ${oam_ip} Return From Keyword If '${status}'=='PASS' ${public_ip} + ${status} ${public_ip}= Run Keyword And Ignore Error Find Openstack 2 ${addresses} ${oam_ip} + Return From Keyword If '${status}'=='PASS' ${public_ip} Fail ${oam_ip} Server Not Found Find Rackspace @@ -92,11 +102,17 @@ Find Rackspace Fail ${oam_ip} Server Not Found Find Openstack - [Arguments] ${addresses} ${oam_ip} - ${ips} Get From Dictionary ${addresses} ${GLOBAL_INJECTED_NETWORK} - ${public_ip}= Get V4 IP Openstack ${ips} floating - ##${oam_ips} Get From Dictionary ${addresses} ${GLOBAL_INJECTED_NETWORK} - ${this_oam_ip}= Get V4 IP Openstack ${ips} fixed + [Arguments] ${addresses} ${oam_ip} + ${public_ip}= Get V4 IP Openstack ${addresses} external + ${this_oam_ip}= Get V4 IP Openstack ${addresses} ${GLOBAL_INJECTED_NETWORK} + Return From Keyword If '${this_oam_ip}'=='${oam_ip}' ${public_ip} + Fail ${oam_ip} Server Not Found + +Find Openstack 2 + [Arguments] ${addresses} ${oam_ip} + ${ipmaps}= Get From DIctionary ${addresses} ${GLOBAL_INJECTED_NETWORK} + ${public_ip}= Get V4 IP Openstack 2 ${ipmaps} floating + ${this_oam_ip}= Get V4 IP Openstack 2 ${ipmaps} fixed Return From Keyword If '${this_oam_ip}'=='${oam_ip}' ${public_ip} Fail ${oam_ip} Server Not Found @@ -109,10 +125,19 @@ Get V4 IP Fail No Version 4 IP Get V4 IP Openstack + [Arguments] ${addresses} ${testtype} + ${ipmaps}= Get From Dictionary ${addresses} ${testtype} + :for ${ipmap} in @{ipmaps} + \ ${ip} Get From Dictionary ${ipmap} addr + \ ${version} Get From Dictionary ${ipmap} version + \ Return from Keyword if '${version}'=='4' ${ip} + Fail No Version 4 IP + +Get V4 IP Openstack 2 [Arguments] ${ipmaps} ${testtype} :for ${ipmap} in @{ipmaps} \ ${type} Get From Dictionary ${ipmap} OS-EXT-IPS:type \ ${ip} Get From Dictionary ${ipmap} addr \ ${version} Get From Dictionary ${ipmap} version \ Return from Keyword if '${version}'=='4' and '${type}'=='${testtype}' ${ip} - Fail No Version 4 IP
\ No newline at end of file + Fail No Version 4 IP
\ No newline at end of file |