From 7d73246fe7229c7dd9bc79e9443eba00cf277785 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Fri, 17 Apr 2020 16:46:09 +0200 Subject: OVN IPv6 Fixes: - SB/NB DB address format (single host) for SB/NB DB daemon - SB/NB DB address format (all hosts) for Neutron / northd / ovn-ovs bootstrap - OVN tests Change-Id: I539773c48f89b731d068280c228ce11782bf5788 Closes-Bug: #1875222 --- tests/test-ovn.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tests/test-ovn.sh') diff --git a/tests/test-ovn.sh b/tests/test-ovn.sh index fb13682da..bf47f3de5 100755 --- a/tests/test-ovn.sh +++ b/tests/test-ovn.sh @@ -8,12 +8,17 @@ set -o pipefail export PYTHONUNBUFFERED=1 function test_ovn_logged { + # NOTE(yoctozepto): could use real ini parsing but this is fine for now + local neutron_ml2_conf_path=/etc/kolla/neutron-server/ml2_conf.ini + ovn_nb_connection=$(sudo grep -P -o -e "(?<=^ovn_nb_connection = ).*" "$neutron_ml2_conf_path") + ovn_sb_connection=$(sudo grep -P -o -e "(?<=^ovn_sb_connection = ).*" "$neutron_ml2_conf_path") + # 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 + sudo docker exec ovn_northd ovn-nbctl --db "$ovn_nb_connection" 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 + sudo docker exec ovn_northd ovn-sbctl --db "$ovn_sb_connection" show # Test OVSDB cluster state if [[ $BASE_DISTRO =~ ^(debian|ubuntu)$ ]]; then -- cgit v1.2.3