Fix tests for Octavia API compat changes
Change-Id: I524c5a3534914e6c130dd4c5bed2be77d7e38c74 Depends-On: https://review.openstack.org/#/c/563341/
This commit is contained in:
parent
51e91b4dfe
commit
a795ae6ffc
|
@ -60,3 +60,6 @@ releasenotes/build
|
||||||
|
|
||||||
# Oslo config generator
|
# Oslo config generator
|
||||||
etc/octavia.tempest.conf.sample
|
etc/octavia.tempest.conf.sample
|
||||||
|
|
||||||
|
# PyCharm IDE
|
||||||
|
.idea
|
||||||
|
|
|
@ -19,7 +19,7 @@ BYTES_IN = 'bytes_in'
|
||||||
BYTES_OUT = 'bytes_out'
|
BYTES_OUT = 'bytes_out'
|
||||||
CREATED_AT = 'created_at'
|
CREATED_AT = 'created_at'
|
||||||
DESCRIPTION = 'description'
|
DESCRIPTION = 'description'
|
||||||
FLAVOR = 'flavor'
|
FLAVOR_ID = 'flavor_id'
|
||||||
ID = 'id'
|
ID = 'id'
|
||||||
LISTENERS = 'listeners'
|
LISTENERS = 'listeners'
|
||||||
LOADBALANCER = 'loadbalancer'
|
LOADBALANCER = 'loadbalancer'
|
||||||
|
@ -40,7 +40,7 @@ VIP_QOS_POLICY_ID = 'vip_qos_policy_id'
|
||||||
|
|
||||||
# API valid fields
|
# API valid fields
|
||||||
SHOW_LOAD_BALANCER_RESPONSE_FIELDS = (
|
SHOW_LOAD_BALANCER_RESPONSE_FIELDS = (
|
||||||
ADMIN_STATE_UP, CREATED_AT, DESCRIPTION, FLAVOR, ID, LISTENERS, NAME,
|
ADMIN_STATE_UP, CREATED_AT, DESCRIPTION, FLAVOR_ID, ID, LISTENERS, NAME,
|
||||||
OPERATING_STATUS, POOLS, PROJECT_ID, PROVIDER, PROVISIONING_STATUS,
|
OPERATING_STATUS, POOLS, PROJECT_ID, PROVIDER, PROVISIONING_STATUS,
|
||||||
UPDATED_AT, VIP_ADDRESS, VIP_NETWORK_ID, VIP_PORT_ID, VIP_SUBNET_ID,
|
UPDATED_AT, VIP_ADDRESS, VIP_NETWORK_ID, VIP_PORT_ID, VIP_SUBNET_ID,
|
||||||
VIP_QOS_POLICY_ID)
|
VIP_QOS_POLICY_ID)
|
||||||
|
|
|
@ -49,7 +49,14 @@ def wait_for_status(show_client, id, status_key, status,
|
||||||
LOG.info('Waiting for {name} status to update to {status}'.format(
|
LOG.info('Waiting for {name} status to update to {status}'.format(
|
||||||
name=show_client.__name__, status=status))
|
name=show_client.__name__, status=status))
|
||||||
while True:
|
while True:
|
||||||
response = show_client(id)
|
if status == const.DELETED:
|
||||||
|
try:
|
||||||
|
response = show_client(id)
|
||||||
|
except exceptions.NotFound:
|
||||||
|
return
|
||||||
|
else:
|
||||||
|
response = show_client(id)
|
||||||
|
|
||||||
if root_tag:
|
if root_tag:
|
||||||
object_details = response[root_tag]
|
object_details = response[root_tag]
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue