Add "wait for active" after object delete

Currently we are waiting for the object to finish deleting, but
we are not waiting for the LB to go back to ACTIVE. On fast test
hosts this can lead to an immutable error on the shared parent objects.
This patch adds a "wait for active" after the object "wait for deleted".

Change-Id: Ie4c3ffeb194a779b2e4e04ef423d23e3891ad3ce
This commit is contained in:
Michael Johnson 2018-06-29 08:54:35 -07:00
parent 74617dabff
commit b0573224f5
6 changed files with 42 additions and 0 deletions

View File

@ -788,3 +788,10 @@ class HealthMonitorAPITest(test_base.LoadBalancerBaseTest):
const.PROVISIONING_STATUS,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer,
self.lb_id, const.PROVISIONING_STATUS,
const.ACTIVE,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)

View File

@ -787,3 +787,10 @@ class L7PolicyAPITest(test_base.LoadBalancerBaseTest):
const.PROVISIONING_STATUS,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer,
self.lb_id, const.PROVISIONING_STATUS,
const.ACTIVE,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)

View File

@ -673,3 +673,10 @@ class L7RuleAPITest(test_base.LoadBalancerBaseTest):
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout,
l7policy_id=self.l7policy_id)
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer,
self.lb_id, const.PROVISIONING_STATUS,
const.ACTIVE,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)

View File

@ -723,3 +723,10 @@ class ListenerAPITest(test_base.LoadBalancerBaseTest):
const.PROVISIONING_STATUS,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer,
self.lb_id, const.PROVISIONING_STATUS,
const.ACTIVE,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)

View File

@ -857,3 +857,10 @@ class MemberAPITest(test_base.LoadBalancerBaseTest):
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout,
pool_id=self.pool_id)
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer,
self.lb_id, const.PROVISIONING_STATUS,
const.ACTIVE,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)

View File

@ -711,3 +711,10 @@ class PoolAPITest(test_base.LoadBalancerBaseTest):
const.PROVISIONING_STATUS,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer,
self.lb_id, const.PROVISIONING_STATUS,
const.ACTIVE,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)