From ca380e6d3042dce7f06de3f06d0407d8cdb9804c Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 16 Apr 2020 12:25:07 +0200 Subject: OVN: Followup changes Followup of last reviews from [1]. [1]: https://review.opendev.org/#/c/696841 Change-Id: I7085093b20e8848e09dc521ae9fbf120e909470d --- tests/test-ovn.sh | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'tests/test-ovn.sh') diff --git a/tests/test-ovn.sh b/tests/test-ovn.sh index bfb2dd99a..fb13682da 100755 --- a/tests/test-ovn.sh +++ b/tests/test-ovn.sh @@ -4,22 +4,37 @@ set -o xtrace set -o errexit set -o pipefail -# Enable unbuffered output for Ansible in Jenkins. +# Enable unbuffered output export PYTHONUNBUFFERED=1 function test_ovn_logged { + # List OVN NB/SB entries + echo "OVN NB DB entries:" + sudo docker exec ovn_northd ovn-nbctl --db "tcp:192.0.2.1:6641,tcp:192.0.2.2:6641,tcp:192.0.2.3:6641" show + + echo "OVN SB DB entries:" + sudo docker exec ovn_northd ovn-sbctl --db "tcp:192.0.2.1:6642,tcp:192.0.2.2:6642,tcp:192.0.2.3:6642" show + # Test OVSDB cluster state if [[ $BASE_DISTRO =~ ^(debian|ubuntu)$ ]]; then - sudo docker exec ovn_nb_db ovs-appctl -t /var/run/openvswitch/ovnnb_db.ctl cluster/status OVN_Northbound - sudo docker exec ovn_sb_db ovs-appctl -t /var/run/openvswitch/ovnsb_db.ctl cluster/status OVN_Southbound + OVNNB_STATUS=$(sudo docker exec ovn_nb_db ovs-appctl -t /var/run/openvswitch/ovnnb_db.ctl cluster/status OVN_Northbound) + OVNSB_STATUS=$(sudo docker exec ovn_sb_db ovs-appctl -t /var/run/openvswitch/ovnsb_db.ctl cluster/status OVN_Southbound) else - sudo docker exec ovn_nb_db ovs-appctl -t /var/run/ovn/ovnnb_db.ctl cluster/status OVN_Northbound - sudo docker exec ovn_sb_db ovs-appctl -t /var/run/ovn/ovnsb_db.ctl cluster/status OVN_Southbound + OVNNB_STATUS=$(sudo docker exec ovn_nb_db ovs-appctl -t /var/run/ovn/ovnnb_db.ctl cluster/status OVN_Northbound) + OVNSB_STATUS=$(sudo docker exec ovn_sb_db ovs-appctl -t /var/run/ovn/ovnsb_db.ctl cluster/status OVN_Southbound) fi - # List OVN NB/SB entries - sudo docker exec ovn_northd ovn-nbctl --db "tcp:192.0.2.1:6641,tcp:192.0.2.2:6641,tcp:192.0.2.3:6641" show - sudo docker exec ovn_northd ovn-sbctl --db "tcp:192.0.2.1:6642,tcp:192.0.2.2:6642,tcp:192.0.2.3:6642" show + if [[ $(grep -o "at tcp:" <<< ${OVNNB_STATUS} | wc -l) != "3" ]]; then + echo "ERR: NB Cluster does not have 3 nodes" + echo "Output: ${OVNNB_STATUS}" + exit 1 + fi + + if [[ $(grep -o "at tcp:" <<< ${OVNSB_STATUS} | wc -l) != "3" ]]; then + echo "ERR: SB Cluster does not have 3 nodes" + echo "Output: ${OVNSB_STATUS}" + exit 1 + fi } function test_ovn { -- cgit v1.2.3