openstack/kolla-ansible
Code Issues Proposed changes

Merge "[CI] Drop the workaround in Masakari client calls"

Browse Source
This commit is contained in:
Zuul 2021-03-26 09:54:17 +00:00 committed by Gerrit Code Review
commit 968534cf8d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/test-masakari.sh
View File

@ -8,17 +8,12 @@ set -o pipefail
export PYTHONUNBUFFERED=1 export PYTHONUNBUFFERED=1
function test_masakari_logged { function test_masakari_logged {
# Source OpenStack credentials # Source OpenStack credentials
. /etc/kolla/admin-openrc.sh . /etc/kolla/admin-openrc.sh
# Activate virtualenv to access Masakari client # Activate virtualenv to access Masakari client
. ~/openstackclient-venv/bin/activate . ~/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 # Get the first Nova compute
if ! HYPERVISOR=$(openstack hypervisor list -f value -c 'Hypervisor Hostname' | head -n1); then if ! HYPERVISOR=$(openstack hypervisor list -f value -c 'Hypervisor Hostname' | head -n1); then
echo "Unable to get Nova hypervisor list" echo "Unable to get Nova hypervisor list"
@ -26,19 +21,19 @@ function test_masakari_logged {
fi fi
# Create Masakari segment # 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" echo "Unable to create Masakari segment"
return 1 return 1
fi fi
# Add Nova compute to Masakari segment # 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" echo "Unable to add Nova hypervisor to Masakari segment"
return 1 return 1
fi fi
# Delete Masakari segment # 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" echo "Unable to delete Masakari segment"
return 1 return 1
fi fi