openstack/kolla-ansible
Code Issues Proposed changes

CI: Fix cases where port is not available yet

Browse Source 
Closes-Bug: #2075966

Change-Id: I6ed82ecc7ca82c09aacb2a65254f794c72365188
This commit is contained in:
Michal Nasiadka 2024-07-19 14:32:52 +02:00
parent 9a5059d440
commit 19804048eb
4 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/test-core-openstack.sh
View File

@ -441,6 +441,17 @@ function test_internal_dns_integration {
openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME} openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME}
SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id) SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
attempt=0
while [[ -z $(openstack port list --device-id ${SERVER_ID} -f value -c ID) ]]; do
echo "Port for server ${SERVER_NAME} not available yet"
attempt=$((attempt+1))
if [[ $attempt -eq 10 ]]; then
echo "ERROR: Port for server ${SERVER_NAME} failed to become available"
openstack port list --device-id ${SERVER_ID}
return 1
fi
sleep $attempt
done
PORT_ID=$(openstack port list --device-id ${SERVER_ID} -f value -c ID) PORT_ID=$(openstack port list --device-id ${SERVER_ID} -f value -c ID)
DNS_ASSIGNMENT=$(openstack port show ${PORT_ID} -f json -c dns_assignment) DNS_ASSIGNMENT=$(openstack port show ${PORT_ID} -f json -c dns_assignment)

11
tests/test-magnum.sh
View File

@ -61,6 +61,17 @@ function test_designate {
openstack server create --image cirros --flavor m1.tiny --network tenant-dns-test ${SERVER_NAME} openstack server create --image cirros --flavor m1.tiny --network tenant-dns-test ${SERVER_NAME}
SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id) SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
attempt=0
while [[ -z $(openstack port list --device-id ${SERVER_ID} -f value -c ID) ]]; do
echo "Port for server ${SERVER_NAME} not available yet"
attempt=$((attempt+1))
if [[ $attempt -eq 10 ]]; then
echo "ERROR: Port for server ${SERVER_NAME} failed to become available"
openstack port list --device-id ${SERVER_ID}
return 1
fi
sleep $attempt
done
PORT_ID=$(openstack port list --device-id ${SERVER_ID} -f value -c ID) PORT_ID=$(openstack port list --device-id ${SERVER_ID} -f value -c ID)
openstack floating ip create public1 --port ${PORT_ID} openstack floating ip create public1 --port ${PORT_ID}

22
tests/test-octavia.sh
View File

@ -58,6 +58,17 @@ function test_octavia {
# Add a floating IP to the load balancer. # Add a floating IP to the load balancer.
lb_fip=$(openstack floating ip create public1 -f value -c name) lb_fip=$(openstack floating ip create public1 -f value -c name)
lb_vip=$(openstack loadbalancer show lb -f value -c vip_address) lb_vip=$(openstack loadbalancer show lb -f value -c vip_address)
attempt=0
while [[ $(openstack port list --fixed-ip ip-address=$lb_vip -f value -c ID) == "" ]]; do
echo "Port for LB with VIP ip addr $lb_vip not available yet"
attempt=$((attempt+1))
if [[ $attempt -eq 10 ]]; then
echo "ERROR: Port for LB with VIP ip addr failed to become available"
openstack port list --fixed-ip ip-address=$lb_vip
return 1
fi
sleep $attempt
done
lb_port_id=$(openstack port list --fixed-ip ip-address=$lb_vip -f value -c ID) lb_port_id=$(openstack port list --fixed-ip ip-address=$lb_vip -f value -c ID)
openstack floating ip set $lb_fip --port $lb_port_id openstack floating ip set $lb_fip --port $lb_port_id
@ -124,6 +135,17 @@ function test_internal_dns_integration {
openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME} openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME}
SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id) SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
attempt=0
while [[ $(openstack port list --device-id ${SERVER_ID} -f value -c ID) == "" ]]; do
echo "Port for server ${SERVER_NAME} not available yet"
attempt=$((attempt+1))
if [[ $attempt -eq 10 ]]; then
echo "ERROR: Port for server ${SERVER_NAME} failed to become available"
openstack port list --device-id ${SERVER_ID}
return 1
fi
sleep $attempt
done
PORT_ID=$(openstack port list --device-id ${SERVER_ID} -f value -c ID) PORT_ID=$(openstack port list --device-id ${SERVER_ID} -f value -c ID)
DNS_ASSIGNMENT=$(openstack port show ${PORT_ID} -f json -c dns_assignment) DNS_ASSIGNMENT=$(openstack port show ${PORT_ID} -f json -c dns_assignment)

11
tests/test-ovn.sh
View File

@ -74,6 +74,17 @@ function test_octavia {
echo "Add a floating IP to the load balancer." echo "Add a floating IP to the load balancer."
lb_fip=$(openstack floating ip create public1 -f value -c name) lb_fip=$(openstack floating ip create public1 -f value -c name)
lb_vip=$(openstack loadbalancer show test_ovn_lb -f value -c vip_address) lb_vip=$(openstack loadbalancer show test_ovn_lb -f value -c vip_address)
attempt=0
while [[ $(openstack port list --fixed-ip ip-address=$lb_vip -f value -c ID) == "" ]]; do
echo "Port for LB with VIP ip addr $lb_vip not available yet"
attempt=$((attempt+1))
if [[ $attempt -eq 10 ]]; then
echo "ERROR: Port for LB with VIP ip addr failed to become available"
openstack port list --fixed-ip ip-address=$lb_vip
return 1
fi
sleep $attempt
done
lb_port_id=$(openstack port list --fixed-ip ip-address=$lb_vip -f value -c ID) lb_port_id=$(openstack port list --fixed-ip ip-address=$lb_vip -f value -c ID)
openstack floating ip set $lb_fip --port $lb_port_id openstack floating ip set $lb_fip --port $lb_port_id