Merge "Fix unexpected argument timeout on LB waiters"
This commit is contained in:
commit
9822115305
|
@ -101,21 +101,21 @@ class OctaviaLoadbalancerStackFixture(heat.HeatStackFixture):
|
||||||
else:
|
else:
|
||||||
return self.vip_network.ipv6_subnet_id
|
return self.vip_network.ipv6_subnet_id
|
||||||
|
|
||||||
def wait_for_active_loadbalancer(self):
|
def wait_for_active_loadbalancer(self,
|
||||||
loadbalancer_id = self.stack.output_show(
|
timeout: tobiko.Seconds = None):
|
||||||
'loadbalancer_id')['output']['output_value']
|
|
||||||
octavia.wait_for_status(status_key=octavia.PROVISIONING_STATUS,
|
octavia.wait_for_status(status_key=octavia.PROVISIONING_STATUS,
|
||||||
status=octavia.ACTIVE,
|
status=octavia.ACTIVE,
|
||||||
get_client=octavia.get_loadbalancer,
|
get_client=octavia.get_loadbalancer,
|
||||||
object_id=loadbalancer_id)
|
object_id=self.loadbalancer_id,
|
||||||
|
timeout=timeout)
|
||||||
|
|
||||||
def wait_for_update_loadbalancer(self):
|
def wait_for_update_loadbalancer(self,
|
||||||
loadbalancer_id = self.stack.output_show(
|
timeout: tobiko.Seconds = None):
|
||||||
'loadbalancer_id')['output']['output_value']
|
|
||||||
octavia.wait_for_status(status_key=octavia.PROVISIONING_STATUS,
|
octavia.wait_for_status(status_key=octavia.PROVISIONING_STATUS,
|
||||||
status=octavia.PENDING_UPDATE,
|
status=octavia.PENDING_UPDATE,
|
||||||
get_client=octavia.get_loadbalancer,
|
get_client=octavia.get_loadbalancer,
|
||||||
object_id=loadbalancer_id)
|
object_id=self.loadbalancer_id,
|
||||||
|
timeout=timeout)
|
||||||
|
|
||||||
|
|
||||||
class OctaviaListenerStackFixture(heat.HeatStackFixture):
|
class OctaviaListenerStackFixture(heat.HeatStackFixture):
|
||||||
|
|
Loading…
Reference in New Issue