diff options
Diffstat (limited to 'robot')
| -rw-r--r-- | robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.env | 1 | ||||
| -rw-r--r-- | robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml | 6 | ||||
| -rw-r--r-- | robot/assets/asdc/base_vfw/base_vfw.yaml | 352 | ||||
| -rw-r--r-- | robot/assets/asdc/base_vlb/base_vlb.yaml | 417 | ||||
| -rw-r--r-- | robot/assets/asdc/base_vlb/dnsscaling.yaml | 196 | ||||
| -rw-r--r-- | robot/assets/templates/sdnc/preload.template | 62 | ||||
| -rw-r--r-- | robot/assets/templates/web/index.html.template | 46 | ||||
| -rw-r--r-- | robot/resources/msb_interface.robot | 1 | ||||
| -rw-r--r-- | robot/testsuites/health-check.robot | 48 | ||||
| -rw-r--r-- | robot/testsuites/update_onap_page.robot | 57 |
10 files changed, 698 insertions, 488 deletions
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/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/msb_interface.robot b/robot/resources/msb_interface.robot index f6e49816..53b67da6 100644 --- a/robot/resources/msb_interface.robot +++ b/robot/resources/msb_interface.robot @@ -20,5 +20,6 @@ Run MSB Get Request [Arguments] ${data_path} ${session}= Create Session msb ${MSB_ENDPOINT} ${resp}= Get Request msb ${data_path} + Should Be Equal As Integers ${resp.status_code} 200 Log Received response from MSB ${resp.text} [Return] ${resp} diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot index f11d50e9..f6eb60ea 100644 --- a/robot/testsuites/health-check.robot +++ b/robot/testsuites/health-check.robot @@ -60,3 +60,51 @@ Basic VID Health Check Basic Microservice Bus Health Check [Tags] health Run MSB Health Check + +catalog API Health Check + [Tags] health + Run MSB Get Request /api/catalog/v1/swagger.json + +gvnfmdriver API Health Check + [Tags] health + Run MSB Get Request /api/gvnfmdriver/v1/swagger.json + +multicloud API Health Check + [Tags] health + Run MSB Get Request /api/multicloud/v0/swagger.json + +multicloud-ocata API Health Check + [Tags] health + Run MSB Get Request /api/multicloud-ocata/v0/swagger.json + +multicloud-titanium_cloud API Health Check + [Tags] health + Run MSB Get Request /api/multicloud-titanium_cloud/v0/swagger.json + +multicloud-vio API Health Check + [Tags] health + Run MSB Get Request /api/multicloud-vio/v0/swagger.json + +nslcm API Health Check + [Tags] health + Run MSB Get Request /api/nslcm/v1/swagger.json + +vnflcm API Health Check + [Tags] health + Run MSB Get Request /api/vnflcm/v1/swagger.json + +vnfmgr API Health Check + [Tags] health + Run MSB Get Request /api/vnfmgr/v1/swagger.json + +vnfres API Health Check + [Tags] health + Run MSB Get Request /api/vnfres/v1/swagger.json + +ztesdncdriver API Health Check + [Tags] health + Run MSB Get Request /api/ztesdncdriver/v1/swagger.json + +ztevmanagerdriver API Health Check + [Tags] health + Run MSB Get Request /api/ztevmanagerdriver/v1/swagger.json 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 |