From c0ba63adadc68be80c76ba48616aad610ee51152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 23 Feb 2021 19:20:08 +0100 Subject: [PATCH] [CI] Drop the workaround in Masakari client calls Now that the issue is fixed upstream, let's remove the workaround. [1] If3943060b5d09bd153b6401d34c7d10d3dc864fe Change-Id: I9cbeee5a397d736338ff2065001d9d6be20cb66e --- tests/test-masakari.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/test-masakari.sh b/tests/test-masakari.sh index 4601a2b589..28454f508c 100755 --- a/tests/test-masakari.sh +++ b/tests/test-masakari.sh @@ -8,17 +8,12 @@ set -o pipefail export PYTHONUNBUFFERED=1 function test_masakari_logged { - # Source OpenStack credentials . /etc/kolla/admin-openrc.sh # Activate virtualenv to access Masakari client . ~/openstackclient-venv/bin/activate - # NOTE:(gtrellu) Masakari client/API has a bug which generate a mismatch - # between what the client send and what the API should received. - CLIENT_OPTS="--os-ha-api-version 1.0" - # Get the first Nova compute if ! HYPERVISOR=$(openstack hypervisor list -f value -c 'Hypervisor Hostname' | head -n1); then echo "Unable to get Nova hypervisor list" @@ -26,19 +21,19 @@ function test_masakari_logged { fi # Create Masakari segment - if ! openstack $CLIENT_OPTS segment create test_segment auto COMPUTE; then + if ! openstack segment create test_segment auto COMPUTE; then echo "Unable to create Masakari segment" return 1 fi # Add Nova compute to Masakari segment - if ! openstack $CLIENT_OPTS segment host create $HYPERVISOR COMPUTE SSH test_segment; then + if ! openstack segment host create $HYPERVISOR COMPUTE SSH test_segment; then echo "Unable to add Nova hypervisor to Masakari segment" return 1 fi # Delete Masakari segment - if ! openstack $CLIENT_OPTS segment delete test_segment; then + if ! openstack segment delete test_segment; then echo "Unable to delete Masakari segment" return 1 fi