diff options
| -rwxr-xr-x | bootstrap-hc2vpp-integration-odl.sh | 236 | ||||
| -rwxr-xr-x | bootstrap-hc2vpp-verify-odl.sh | 235 | ||||
| -rw-r--r-- | resources/libraries/python/HTTPRequest.py | 9 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/HoneycombSetup.py | 36 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/honeycomb.robot | 16 | ||||
| -rw-r--r-- | tests/func/honeycomb/__init__.robot | 17 |
6 files changed, 511 insertions, 38 deletions
diff --git a/bootstrap-hc2vpp-integration-odl.sh b/bootstrap-hc2vpp-integration-odl.sh new file mode 100755 index 0000000000..76adc834d4 --- /dev/null +++ b/bootstrap-hc2vpp-integration-odl.sh @@ -0,0 +1,236 @@ +#!/bin/bash +# Copyright (c) 2017 Cisco and/or its affiliates. +# 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. + +set -x + +cat /etc/hostname +cat /etc/hosts + +export DEBIAN_FRONTEND=noninteractive +sudo apt-get -y update +sudo apt-get -y install libpython2.7-dev python-virtualenv + +VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30") +VIRL_SERVER="" + +VIRL_USERNAME=jenkins-in +VIRL_PKEY=priv_key +VIRL_SERVER_STATUS_FILE="status" +VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" + +STREAM=$1 +OS=$2 +ODL=$3 + +if [ "${OS}" == "ubuntu1604" ]; then + VIRL_TOPOLOGY=double-ring-nested.xenial + VIRL_RELEASE=csit-ubuntu-16.04.1_2017-02-23_1.8 +elif [ "${OS}" == "centos7" ]; then + VIRL_TOPOLOGY=double-ring-nested.centos7 + VIRL_RELEASE=csit-centos-7.3-1611_2017-02-23_1.4 +fi + +SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" + +function ssh_do() { + echo + echo "### " ssh $@ + ssh ${SSH_OPTIONS} $@ +} + +rm -f ${VIRL_PKEY} +cat > ${VIRL_PKEY} <<EOF +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEA+IHXq87GcqMR1C47rzx6Cbip5Ghq8pKrbqKrP5Nf41HcYrT6 +GOXl9nFWKsMOzIlIn+8y7Il27eZh7csQGApbg8QLiHMtcYEmWNzKZpkqg4nuAPxX +VXwlKgnKX902SrET9Gp9TDayiHtCRWVfrlPPPSA0UEXW6BjLN/uHJ+W/Xzrrab+9 +asBVa05vT2W6n0KJ66zfCaeDM912mQ6SttscAwFoWDmdHlegiVqrlIG2ABxOvxxz +L3dM3iSmlmQlzv9bThjo+nI4KFYh6m5wrZmAo5r/4q9CIJc21HVnTqkGOWJIZz6J +73lePJVSq5gYqaoGw3swFEA/MDkOx7baWKSoLQIDAQABAoIBAQCNBeolNp+JWJ76 +gQ4fwLsknyXSV6sxYyhkDW4PEwwcTU06uqce0AAzXVffxne0fMe48x47+zqBgPbb +4huM+Pu8B9nfojUMr5TaYtl9Zbgpk3F8H7dT7LKOa6XrxvZTZrADSRc30+Z26zPN +e9zTaf42Gvt0/l0Zs1BHwbaOXqO+XuwJ3/F9Sf3PQYWXD3EOWjpHDP/X/1vAs6lV +SLkm6J/9KKE1m6I6LTYjIXuYt4SXybW6N2TSy54hhQtYcDUnIU2hR/PHVWKrGA0J +kELgrtTNTdbML27O5gFWU4PLUEYTZ9fN11D6qUZKxLcPOiPPHXkiILMRCCnG5DYI +ksBAU/YlAoGBAPxZO9VO18TYc8THV1nLKcvT2+1oSs1UcA2wNQMU55t910ZYinRa +MRwUhMOf8Mv5wOeiZaRICQB1PnVWtDVmGECgPpK6jUxqAwn8rgJcnoafLGL5YKMY +RVafTe6N5LXgCaOcJrk21wxs6v7ninEbUxxc575urOvZMBkymDw91dwbAoGBAPwa +YRhKhrzFKZzdK0RadVjnxKvolUllpoqqg3XuvmeAJHAOAnaOgVWq68NAcp5FZJv0 +2D2Up7TX8pjf9MofP1SJbcraKBpK4NzfNkA0dSdEi+FhVofAJ9umB2o5LW1n7sab +UIrjsdzSJK/9Zb9yTTHPyibYzNEgaJV1HsbxfEFXAoGAYO2RmvRm0phll18OQVJV +IpKk9kLKAKZ/R/K32hAsikBC8SVPQTPniyaifFWx81diblalff2hX4ipTf7Yx24I +wMIMZuW7Im/R7QMef4+94G3Bad7p7JuE/qnAEHJ2OBnu+eYfxaK35XDsrq6XMazS +NqHE7hOq3giVfgg+C12hCKMCgYEAtu9dbYcG5owbehxzfRI2/OCRsjz/t1bv1seM +xVMND4XI6xb/apBWAZgZpIFrqrWoIBM3ptfsKipZe91ngBPUnL9s0Dolx452RVAj +yctHB8uRxWYgqDkjsxtzXf1HnZBBkBS8CUzYj+hdfuddoeKLaY3invXLCiV+PpXS +U4KAK9kCgYEAtSv0m5+Fg74BbAiFB6kCh11FYkW94YI6B/E2D/uVTD5dJhyEUFgZ +cWsudXjMki8734WSpMBqBp/J8wG3C9ZS6IpQD+U7UXA+roB7Qr+j4TqtWfM+87Rh +maOpG56uAyR0w5Z9BhwzA3VakibVk9KwDgZ29WtKFzuATLFnOtCS46E= +-----END RSA PRIVATE KEY----- +EOF +chmod 600 ${VIRL_PKEY} + +# +# Pick a random host from the array of VIRL servers, and attempt +# to reach it and verify it's status. +# +# The server must be reachable, and have a "status" file with +# the content "PRODUCTION", to be selected. +# +# If the server is not reachable, or does not have the correct +# status, remove it from the array and start again. +# +# Abort if there are no more servers left in the array. +# +while [[ ! "$VIRL_SERVER" ]] +do + num_hosts=${#VIRL_SERVERS[@]} + if [ $num_hosts == 0 ] + then + echo "No more VIRL candidate hosts available, failing." + exit 127 + fi + element=$[ $RANDOM % $num_hosts ] + virl_server_candidate=${VIRL_SERVERS[$element]} + virl_server_status=$(ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${virl_server_candidate} cat $VIRL_SERVER_STATUS_FILE 2>&1) + echo VIRL HOST $virl_server_candidate status is \"$virl_server_status\" + if [ "$virl_server_status" == "$VIRL_SERVER_EXPECTED_STATUS" ] + then + # Candidate is in good status. Select this server. + VIRL_SERVER="$virl_server_candidate" + else + # Candidate is in bad status. Remove from array. + VIRL_SERVERS=("${VIRL_SERVERS[@]:0:$element}" "${VIRL_SERVERS[@]:$[$element+1]}") + fi +done + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +# Download VPP and HC packages from the current branch +echo Downloading packages... +bash ${SCRIPT_DIR}/resources/tools/download_hc_pkgs.sh ${STREAM} ${OS} + +if [ "${OS}" == "centos7" ]; then + VPP_PKGS=(*.rpm) +else + VPP_PKGS=(*.deb) +fi +echo ${VPP_PKGS[@]} +VIRL_DIR_LOC="/tmp" +VPP_PKGS_FULL=(${VPP_PKGS[@]}) + +# Prepend directory location at remote host to package file list +for index in "${!VPP_PKGS_FULL[@]}"; do + VPP_PKGS_FULL[${index}]=${VIRL_DIR_LOC}/${VPP_PKGS_FULL[${index}]} +done + +echo "Updated file names: " ${VPP_PKGS_FULL[@]} + +cat ${VIRL_PKEY} + +# Copy the files to VIRL hosts +DONE="" +for index in "${!VIRL_SERVER[@]}"; do + # Do not copy files in case they have already been copied to the VIRL host + [[ "${DONE[@]}" =~ "${VIRL_SERVER[${index}]}" ]] && copy=0 || copy=1 + + if [ "${copy}" -eq "0" ]; then + echo "files have already been copied to the VIRL host ${VIRL_SERVER[${index}]}" + else + if [ "${OS}" == "centos7" ]; then + scp ${SSH_OPTIONS} *.rpm \ + ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/ + else + scp ${SSH_OPTIONS} *.deb \ + ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/ + fi + result=$? + if [ "${result}" -ne "0" ]; then + echo "Failed to copy files to VIRL host ${VIRL_SERVER[${index}]}" + echo ${result} + exit ${result} + else + echo "files successfully copied to the VIRL host ${VIRL_SERVER[${index}]}" + fi + DONE+=(${VIRL_SERVER[${index}]}) + fi +done + +# Start a simulation on VIRL server +echo "Starting simulation on VIRL server" + +function stop_virl_simulation { + ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER}\ + "stop-testcase ${VIRL_SID}" +} + +VIRL_SID=$(ssh ${SSH_OPTIONS} \ + ${VIRL_USERNAME}@${VIRL_SERVER} \ + "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_PKGS_FULL[@]}") +retval=$? +if [ "${retval}" -ne "0" ]; then + echo "VIRL simulation start failed" + exit ${retval} +fi + +if [[ ! "${VIRL_SID}" =~ session-[a-zA-Z0-9_]{6} ]]; then + echo "No VIRL session ID reported." + exit 127 +fi + +# Upon script exit, cleanup the simulation execution +trap stop_virl_simulation EXIT +echo ${VIRL_SID} + +ssh_do ${VIRL_USERNAME}@${VIRL_SERVER} cat /scratch/${VIRL_SID}/topology.yaml + +# Download the topology file from virl session +scp ${SSH_OPTIONS} \ + ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/topology.yaml \ + topologies/enabled/topology.yaml + +retval=$? +if [ "${retval}" -ne "0" ]; then + echo "Failed to copy topology file from VIRL simulation" + exit ${retval} +fi + +virtualenv --system-site-packages env +. env/bin/activate + +echo pip install +pip install -r ${SCRIPT_DIR}/requirements.txt + +pykwalify -s ${SCRIPT_DIR}/resources/topology_schemas/3_node_topology.sch.yaml \ + -s ${SCRIPT_DIR}/resources/topology_schemas/topology.sch.yaml \ + -d ${SCRIPT_DIR}/topologies/enabled/topology.yaml \ + -vvv + +if [ "$?" -ne "0" ]; then + echo "Topology schema validation failed." + echo "However, the tests will start." +fi + +PYTHONPATH=`pwd` pybot -L TRACE -W 136\ + -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ + --suite "tests.func" \ + --include HC_FUNC \ + --exclude HC_REST_ONLY \ + --noncritical EXPECTED_FAILING \ + --variable HC_ODL:${ODL} \ + tests/ + +# Get Honeycomb log file from virl host +scp ${SSH_OPTIONS} \ + ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true diff --git a/bootstrap-hc2vpp-verify-odl.sh b/bootstrap-hc2vpp-verify-odl.sh new file mode 100755 index 0000000000..5bf15222f1 --- /dev/null +++ b/bootstrap-hc2vpp-verify-odl.sh @@ -0,0 +1,235 @@ +#!/bin/bash +# Copyright (c) 2017 Cisco and/or its affiliates. +# 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. + +set -x + +cat /etc/hostname +cat /etc/hosts + +export DEBIAN_FRONTEND=noninteractive +sudo apt-get -y update +sudo apt-get -y install libpython2.7-dev python-virtualenv + +VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30") +VIRL_SERVER="" + +VIRL_USERNAME=jenkins-in +VIRL_PKEY=priv_key +VIRL_SERVER_STATUS_FILE="status" +VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" + +OS=$1 +ODL=$2 + +if [ "${OS}" == "ubuntu1604" ]; then + VIRL_TOPOLOGY=double-ring-nested.xenial + VIRL_RELEASE=csit-ubuntu-16.04.1_2017-02-23_1.8 +elif [ "${OS}" == "centos7" ]; then + VIRL_TOPOLOGY=double-ring-nested.centos7 + VIRL_RELEASE=csit-centos-7.3-1611_2017-02-23_1.4 +fi + +SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" + +function ssh_do() { + echo + echo "### " ssh $@ + ssh ${SSH_OPTIONS} $@ +} + +rm -f ${VIRL_PKEY} +cat > ${VIRL_PKEY} <<EOF +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEA+IHXq87GcqMR1C47rzx6Cbip5Ghq8pKrbqKrP5Nf41HcYrT6 +GOXl9nFWKsMOzIlIn+8y7Il27eZh7csQGApbg8QLiHMtcYEmWNzKZpkqg4nuAPxX +VXwlKgnKX902SrET9Gp9TDayiHtCRWVfrlPPPSA0UEXW6BjLN/uHJ+W/Xzrrab+9 +asBVa05vT2W6n0KJ66zfCaeDM912mQ6SttscAwFoWDmdHlegiVqrlIG2ABxOvxxz +L3dM3iSmlmQlzv9bThjo+nI4KFYh6m5wrZmAo5r/4q9CIJc21HVnTqkGOWJIZz6J +73lePJVSq5gYqaoGw3swFEA/MDkOx7baWKSoLQIDAQABAoIBAQCNBeolNp+JWJ76 +gQ4fwLsknyXSV6sxYyhkDW4PEwwcTU06uqce0AAzXVffxne0fMe48x47+zqBgPbb +4huM+Pu8B9nfojUMr5TaYtl9Zbgpk3F8H7dT7LKOa6XrxvZTZrADSRc30+Z26zPN +e9zTaf42Gvt0/l0Zs1BHwbaOXqO+XuwJ3/F9Sf3PQYWXD3EOWjpHDP/X/1vAs6lV +SLkm6J/9KKE1m6I6LTYjIXuYt4SXybW6N2TSy54hhQtYcDUnIU2hR/PHVWKrGA0J +kELgrtTNTdbML27O5gFWU4PLUEYTZ9fN11D6qUZKxLcPOiPPHXkiILMRCCnG5DYI +ksBAU/YlAoGBAPxZO9VO18TYc8THV1nLKcvT2+1oSs1UcA2wNQMU55t910ZYinRa +MRwUhMOf8Mv5wOeiZaRICQB1PnVWtDVmGECgPpK6jUxqAwn8rgJcnoafLGL5YKMY +RVafTe6N5LXgCaOcJrk21wxs6v7ninEbUxxc575urOvZMBkymDw91dwbAoGBAPwa +YRhKhrzFKZzdK0RadVjnxKvolUllpoqqg3XuvmeAJHAOAnaOgVWq68NAcp5FZJv0 +2D2Up7TX8pjf9MofP1SJbcraKBpK4NzfNkA0dSdEi+FhVofAJ9umB2o5LW1n7sab +UIrjsdzSJK/9Zb9yTTHPyibYzNEgaJV1HsbxfEFXAoGAYO2RmvRm0phll18OQVJV +IpKk9kLKAKZ/R/K32hAsikBC8SVPQTPniyaifFWx81diblalff2hX4ipTf7Yx24I +wMIMZuW7Im/R7QMef4+94G3Bad7p7JuE/qnAEHJ2OBnu+eYfxaK35XDsrq6XMazS +NqHE7hOq3giVfgg+C12hCKMCgYEAtu9dbYcG5owbehxzfRI2/OCRsjz/t1bv1seM +xVMND4XI6xb/apBWAZgZpIFrqrWoIBM3ptfsKipZe91ngBPUnL9s0Dolx452RVAj +yctHB8uRxWYgqDkjsxtzXf1HnZBBkBS8CUzYj+hdfuddoeKLaY3invXLCiV+PpXS +U4KAK9kCgYEAtSv0m5+Fg74BbAiFB6kCh11FYkW94YI6B/E2D/uVTD5dJhyEUFgZ +cWsudXjMki8734WSpMBqBp/J8wG3C9ZS6IpQD+U7UXA+roB7Qr+j4TqtWfM+87Rh +maOpG56uAyR0w5Z9BhwzA3VakibVk9KwDgZ29WtKFzuATLFnOtCS46E= +-----END RSA PRIVATE KEY----- +EOF +chmod 600 ${VIRL_PKEY} + +# +# Pick a random host from the array of VIRL servers, and attempt +# to reach it and verify it's status. +# +# The server must be reachable, and have a "status" file with +# the content "PRODUCTION", to be selected. +# +# If the server is not reachable, or does not have the correct +# status, remove it from the array and start again. +# +# Abort if there are no more servers left in the array. +# +while [[ ! "$VIRL_SERVER" ]] +do + num_hosts=${#VIRL_SERVERS[@]} + if [ $num_hosts == 0 ] + then + echo "No more VIRL candidate hosts available, failing." + exit 127 + fi + element=$[ $RANDOM % $num_hosts ] + virl_server_candidate=${VIRL_SERVERS[$element]} + virl_server_status=$(ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${virl_server_candidate} cat $VIRL_SERVER_STATUS_FILE 2>&1) + echo VIRL HOST $virl_server_candidate status is \"$virl_server_status\" + if [ "$virl_server_status" == "$VIRL_SERVER_EXPECTED_STATUS" ] + then + # Candidate is in good status. Select this server. + VIRL_SERVER="$virl_server_candidate" + else + # Candidate is in bad status. Remove from array. + VIRL_SERVERS=("${VIRL_SERVERS[@]:0:$element}" "${VIRL_SERVERS[@]:$[$element+1]}") + fi +done + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +# VPP, VPP plugin and Honeycomb packages should already be in working directory +if [ "${OS}" == "centos7" ]; then + VPP_PKGS=(*.rpm) +else + VPP_PKGS=(*.deb) +fi +echo ${VPP_PKGS[@]} +VIRL_DIR_LOC="/tmp" +VPP_PKGS_FULL=(${VPP_PKGS[@]}) + +# Prepend directory location at remote host to package file list +for index in "${!VPP_PKGS_FULL[@]}"; do + VPP_PKGS_FULL[${index}]=${VIRL_DIR_LOC}/${VPP_PKGS_FULL[${index}]} +done + +echo "Updated file names: " ${VPP_PKGS_FULL[@]} + +cat ${VIRL_PKEY} + +# Copy the files to VIRL hosts +DONE="" +for index in "${!VIRL_SERVER[@]}"; do + # Do not copy files in case they have already been copied to the VIRL host + [[ "${DONE[@]}" =~ "${VIRL_SERVER[${index}]}" ]] && copy=0 || copy=1 + + if [ "${copy}" -eq "0" ]; then + echo "files have already been copied to the VIRL host ${VIRL_SERVER[${index}]}" + else + if [ "${OS}" == "centos7" ]; then + scp ${SSH_OPTIONS} *.rpm \ + ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/ + else + scp ${SSH_OPTIONS} *.deb \ + ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/ + fi + result=$? + if [ "${result}" -ne "0" ]; then + echo "Failed to copy files to VIRL host ${VIRL_SERVER[${index}]}" + echo ${result} + exit ${result} + else + echo "files successfully copied to the VIRL host ${VIRL_SERVER[${index}]}" + fi + DONE+=(${VIRL_SERVER[${index}]}) + fi +done + +# Start a simulation on VIRL server +echo "Starting simulation on VIRL server" + +function stop_virl_simulation { + ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER}\ + "stop-testcase ${VIRL_SID}" +} + +VIRL_SID=$(ssh ${SSH_OPTIONS} \ + ${VIRL_USERNAME}@${VIRL_SERVER} \ + "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_PKGS_FULL[@]}") +retval=$? +if [ "${retval}" -ne "0" ]; then + echo "VIRL simulation start failed" + exit ${retval} +fi + +if [[ ! "${VIRL_SID}" =~ session-[a-zA-Z0-9_]{6} ]]; then + echo "No VIRL session ID reported." + exit 127 +fi + +# Upon script exit, cleanup the simulation execution +trap stop_virl_simulation EXIT +echo ${VIRL_SID} + +ssh_do ${VIRL_USERNAME}@${VIRL_SERVER} cat /scratch/${VIRL_SID}/topology.yaml + +# Download the topology file from virl session +scp ${SSH_OPTIONS} \ + ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/topology.yaml \ + topologies/enabled/topology.yaml + +retval=$? +if [ "${retval}" -ne "0" ]; then + echo "Failed to copy topology file from VIRL simulation" + exit ${retval} +fi + +virtualenv --system-site-packages env +. env/bin/activate + +echo pip install +pip install -r ${SCRIPT_DIR}/requirements.txt + +pykwalify -s ${SCRIPT_DIR}/resources/topology_schemas/3_node_topology.sch.yaml \ + -s ${SCRIPT_DIR}/resources/topology_schemas/topology.sch.yaml \ + -d ${SCRIPT_DIR}/topologies/enabled/topology.yaml \ + -vvv + +if [ "$?" -ne "0" ]; then + echo "Topology schema validation failed." + echo "However, the tests will start." +fi + +rm -rf ~/*karaf* +cp /nfs/common/karaf_${ODL} ~ + +PYTHONPATH=`pwd` pybot -L TRACE -W 136\ + -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ + --suite "tests.func" \ + --include HC_FUNC \ + --exclude HC_REST_ONLY \ + --noncritical EXPECTED_FAILING \ + --variable HC_ODL:${ODL} \ + tests/ + +# Get Honeycomb log file from virl host +scp ${SSH_OPTIONS} \ + ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true diff --git a/resources/libraries/python/HTTPRequest.py b/resources/libraries/python/HTTPRequest.py index 9c64dbbf9b..869078bca3 100644 --- a/resources/libraries/python/HTTPRequest.py +++ b/resources/libraries/python/HTTPRequest.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 Cisco and/or its affiliates. # 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: @@ -179,9 +179,12 @@ class HTTPRequest(object): """ timeout = kwargs["timeout"] - if BuiltIn().get_variable_value("${use_odl_client}"): - # TODO: node["honeycomb"]["odl_port"] + use_odl = BuiltIn().get_variable_value("${use_odl_client}") + + if use_odl: port = 8181 + # Using default ODL Restconf port + # TODO: add node["honeycomb"]["odl_port"] to topology, use it here odl_url_part = "/network-topology:network-topology/topology/" \ "topology-netconf/node/vpp/yang-ext:mount" else: diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py index 50fd1c997d..d23b092655 100644 --- a/resources/libraries/python/honeycomb/HoneycombSetup.py +++ b/resources/libraries/python/honeycomb/HoneycombSetup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 Cisco and/or its affiliates. # 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: @@ -432,33 +432,29 @@ class HoneycombSetup(object): "node {0}, {1}".format(node, stderr)) @staticmethod - def find_odl_client(node): - """Check if there is a karaf directory in home. + def setup_odl_client(node, odl_name): + """Start ODL client on the specified node. - :param node: Honeycomb node. + Karaf should be located in /nfs/common, and VPP and Honeycomb should + already be running, otherwise the start will fail. + :param node: Node to start ODL client on. + :param odl_name: Name of ODL client version to use. :type node: dict - :returns: True if ODL client is present on node, else False. - :rtype: bool + :type odl_name: str + :raises HoneycombError: If Honeycomb fails to start. """ + logger.debug("Copying ODL Client to home dir.") + ssh = SSH() ssh.connect(node) - (ret_code, stdout, _) = ssh.exec_command_sudo( - "ls ~ | grep karaf") - logger.debug(stdout) - return not bool(ret_code) + cmd = "cp -r /nfs/common/*karaf_{name}* ~/karaf".format(name=odl_name) - @staticmethod - def start_odl_client(node): - """Start ODL client on the specified node. - - karaf should be located in home directory, and VPP and Honeycomb should - already be running, otherwise the start will fail. - :param node: Nodes to start ODL client on. - :type node: dict - :raises HoneycombError: If Honeycomb fails to start. - """ + (ret_code, _, _) = ssh.exec_command_sudo(cmd) + if int(ret_code) != 0: + raise HoneycombError( + "Failed to copy ODL client on node {0}".format(node["host"])) logger.console("\nStarting ODL client ...") diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index 7813ee26bf..336039e1fb 100644 --- a/resources/libraries/robot/honeycomb/honeycomb.robot +++ b/resources/libraries/robot/honeycomb/honeycomb.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 Cisco and/or its affiliates. # 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: @@ -85,9 +85,9 @@ | | ... | \| Restart Honeycomb and VPP and clear persisted configuration \ | | ... | \| ${nodes['DUT1']} \| | | [Arguments] | ${node} +| | Log | Performing clean restart of Honeycomb and VPP. | console=True | | Stop Honeycomb service on DUTs | ${node} | | Clear persisted Honeycomb configuration | ${node} -| | Log | Persistence files cleared. | console=True | | Setup DUT | ${node} | | Setup Honeycomb service on DUTs | ${node} @@ -101,6 +101,7 @@ | | ... | | ... | \| Restart Honeycomb and VPP \| ${nodes['DUT1']} \| | | [Arguments] | ${node} +| | Log | Performing clean restart of Honeycomb and VPP. | console=True | | Restart Honeycomb and VPP on DUTs | ${node} | | Wait until keyword succeeds | 4min | 16sec | | ... | Check honeycomb startup state | ${node} @@ -117,14 +118,9 @@ | | [Arguments] | ${node} | | Archive Honeycomb log | ${node} -| Find ODL client on node -| | [Arguments] | ${node} -| | ${odl_present}= | Find ODL Client | ${node} -| | Return from keyword | ${odl_present} - -| Start ODL client on node -| | [Arguments] | ${node} -| | Start ODL client | ${node} +| Setup ODL Client Service On DUT +| | [Arguments] | ${node} | ${odl_name} +| | Setup ODL client | ${node} | ${odl_name} | | Wait until keyword succeeds | 4min | 16sec | | ... | Mount Honeycomb on ODL | ${node} | | Wait until keyword succeeds | 2min | 16sec diff --git a/tests/func/honeycomb/__init__.robot b/tests/func/honeycomb/__init__.robot index 39e78af9cd..7e9d07aad0 100644 --- a/tests/func/honeycomb/__init__.robot +++ b/tests/func/honeycomb/__init__.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 Cisco and/or its affiliates. # 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: @@ -21,6 +21,7 @@ | Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Suite Setup | Run Keywords | Setup All DUTs Before Test | AND | ... | Configure Honeycomb for testing | ${node} | AND +| ... | Configure ODL Client for testing | ${node} | AND | ... | Set Global Variable | ${node} | Suite Teardown | ... | Archive Honeycomb log file | ${node} @@ -35,7 +36,13 @@ | | Configure jVPP timeout | ${node} | ${14} | | Clear Persisted Honeycomb Configuration | ${node} | | Setup Honeycomb Service On DUTs | ${node} -| | ${use_odl_client}= | Find ODL client on node | ${node} -| | Set Global Variable | ${use_odl_client} -| | Run Keyword If | ${use_odl_client} -| | ... | Start ODL Client on node | ${node} + +| Configure ODL Client for testing +| | [Arguments] | ${node} +| | ${use_odl_client}= | Get Variable Value | ${HC_ODL} +| | Run Keyword If | '${use_odl_client}' != ${NONE} +| | ... | Run Keywords +| | ... | Set Global Variable | ${use_odl_client} | AND +| | ... | Setup ODL Client Service On DUT | ${node} | ${use_odl_client} +| | ... | ELSE | Log | Variable HC_ODL is not present. Not using ODL. +| | ... | level=INFO |