From 0d5d49dc3f462d49cf25dcbbb2dda31e5df2ab21 Mon Sep 17 00:00:00 2001 From: Omer Date: Fri, 19 Nov 2021 11:38:35 +0100 Subject: [PATCH] Fix unexpected argument timeout on LB waiters This patch adds timeout paramter to LB waiter functions. Change-Id: Ib1836dc274df17b307352bf61600fcaab3fea7c1 --- tobiko/openstack/stacks/_octavia.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tobiko/openstack/stacks/_octavia.py b/tobiko/openstack/stacks/_octavia.py index 5a2f68a6b..6d6cd6a81 100644 --- a/tobiko/openstack/stacks/_octavia.py +++ b/tobiko/openstack/stacks/_octavia.py @@ -101,21 +101,21 @@ class OctaviaLoadbalancerStackFixture(heat.HeatStackFixture): else: return self.vip_network.ipv6_subnet_id - def wait_for_active_loadbalancer(self): - loadbalancer_id = self.stack.output_show( - 'loadbalancer_id')['output']['output_value'] + def wait_for_active_loadbalancer(self, + timeout: tobiko.Seconds = None): octavia.wait_for_status(status_key=octavia.PROVISIONING_STATUS, status=octavia.ACTIVE, get_client=octavia.get_loadbalancer, - object_id=loadbalancer_id) + object_id=self.loadbalancer_id, + timeout=timeout) - def wait_for_update_loadbalancer(self): - loadbalancer_id = self.stack.output_show( - 'loadbalancer_id')['output']['output_value'] + def wait_for_update_loadbalancer(self, + timeout: tobiko.Seconds = None): octavia.wait_for_status(status_key=octavia.PROVISIONING_STATUS, status=octavia.PENDING_UPDATE, get_client=octavia.get_loadbalancer, - object_id=loadbalancer_id) + object_id=self.loadbalancer_id, + timeout=timeout) class OctaviaListenerStackFixture(heat.HeatStackFixture):