diff --git a/tobiko/openstack/designate/_client.py b/tobiko/openstack/designate/_client.py index 889f1dd95..3dadc512d 100644 --- a/tobiko/openstack/designate/_client.py +++ b/tobiko/openstack/designate/_client.py @@ -129,7 +129,7 @@ def wait_for_status(status_key, status, get_client, object_id, for attempt in tobiko.retry(timeout=timeout, interval=interval, default_timeout=300., - default_interval=5.): + default_interval=3.): response = get_client(object_id, **kwargs) if response[status_key] == status: return response diff --git a/tobiko/openstack/heat/_stack.py b/tobiko/openstack/heat/_stack.py index 89fe23f8b..b93696c59 100644 --- a/tobiko/openstack/heat/_stack.py +++ b/tobiko/openstack/heat/_stack.py @@ -115,7 +115,7 @@ class HeatStackFixture(base_fixture.BaseResourceFixture): retry_count: int = 3 retry_timeout: float = 1200. min_retry_interval: float = 0.1 - max_retry_interval: float = 5. + max_retry_interval: float = 3. wait_interval: tobiko.Seconds = 3 wait_timeout: tobiko.Seconds = 600. template: _template.HeatTemplateFixture diff --git a/tobiko/openstack/ironic/_node.py b/tobiko/openstack/ironic/_node.py index 21b5e9cc4..53c54cb2e 100644 --- a/tobiko/openstack/ironic/_node.py +++ b/tobiko/openstack/ironic/_node.py @@ -79,7 +79,7 @@ def wait_for_node_power_state( for attempt in tobiko.retry(timeout=timeout, interval=sleep_time, default_timeout=300., - default_interval=5.): + default_interval=3.): _node = get_node(node_id=node_id, client=client) if _node.power_state == power_state: break diff --git a/tobiko/openstack/manila/_waiters.py b/tobiko/openstack/manila/_waiters.py index 0a0129b19..3f9b86c6a 100644 --- a/tobiko/openstack/manila/_waiters.py +++ b/tobiko/openstack/manila/_waiters.py @@ -55,7 +55,7 @@ def wait_for_status(object_id: str, for attempt in tobiko.retry(timeout=timeout, interval=interval, default_timeout=300., - default_interval=5.): + default_interval=3.): response = get_client(object_id, **kwargs) if response[status_key] == status: return response diff --git a/tobiko/openstack/neutron/_router.py b/tobiko/openstack/neutron/_router.py index 31d2db4a0..bc6504245 100644 --- a/tobiko/openstack/neutron/_router.py +++ b/tobiko/openstack/neutron/_router.py @@ -94,7 +94,7 @@ def wait_for_master_and_backup_agents( for attempt in tobiko.retry(timeout=timeout, interval=interval, default_timeout=300., - default_interval=5.): + default_interval=3.): router_agents = _agent.list_l3_agent_hosting_routers(router_id) master_agents = router_agents.with_items(ha_state='active') if master_agents: diff --git a/tobiko/openstack/nova/_client.py b/tobiko/openstack/nova/_client.py index 002d0eec9..f6e891bea 100644 --- a/tobiko/openstack/nova/_client.py +++ b/tobiko/openstack/nova/_client.py @@ -380,7 +380,7 @@ def wait_for_server_status( for attempt in tobiko.retry(timeout=timeout, interval=sleep_time, default_timeout=300., - default_interval=5.): + default_interval=3.): _server = get_server(server_id=server_id, client=client) if _server.status == status: break diff --git a/tobiko/openstack/nova/_service.py b/tobiko/openstack/nova/_service.py index 18d1b9e7b..157dbeaef 100644 --- a/tobiko/openstack/nova/_service.py +++ b/tobiko/openstack/nova/_service.py @@ -49,7 +49,7 @@ def wait_for_services_up(retry: typing.Optional[tobiko.Retry] = None, **list_services_params): for attempt in tobiko.retry(other_retry=retry, default_timeout=300., - default_interval=5.): + default_interval=3.): try: services = _client.list_services(**list_services_params) except (ks_exceptions.connection.ConnectFailure, diff --git a/tobiko/openstack/octavia/_waiters.py b/tobiko/openstack/octavia/_waiters.py index 6dff21fea..780697ac0 100644 --- a/tobiko/openstack/octavia/_waiters.py +++ b/tobiko/openstack/octavia/_waiters.py @@ -76,7 +76,7 @@ def wait_for_octavia_service(interval: tobiko.Seconds = None, for attempt in tobiko.retry(timeout=timeout, interval=interval, default_timeout=180., - default_interval=5.): + default_interval=3.): try: # Call any Octavia API octavia.list_amphorae() except octavia.OctaviaClientException as ex: diff --git a/tobiko/openstack/stacks/_nova.py b/tobiko/openstack/stacks/_nova.py index b49319be3..b68ca04d9 100644 --- a/tobiko/openstack/stacks/_nova.py +++ b/tobiko/openstack/stacks/_nova.py @@ -361,7 +361,7 @@ class ServerStackFixture(heat.HeatStackFixture, ABC): interval=retry_interval, default_count=3, default_timeout=900., - default_interval=5.): + default_interval=3.): tobiko.setup_fixture(self) server_id = self.server_id try: diff --git a/tobiko/openstack/tests/_neutron.py b/tobiko/openstack/tests/_neutron.py index 5bc57ff46..d3cb9257c 100644 --- a/tobiko/openstack/tests/_neutron.py +++ b/tobiko/openstack/tests/_neutron.py @@ -50,7 +50,7 @@ def build_ovn_db_show_dict(ovn_db_show_str): return ovn_master_db_dict -def test_neutron_agents_are_alive(timeout=420., interval=5.) \ +def test_neutron_agents_are_alive(timeout=420., interval=3.) \ -> tobiko.Selection[neutron.NeutronAgentType]: for attempt in tobiko.retry(timeout=timeout, interval=interval): LOG.debug("Look for unhealthy Neutron agents...") @@ -98,7 +98,7 @@ def test_neutron_agents_are_alive(timeout=420., interval=5.) \ def test_alive_agents_are_consistent_along_time(retry_timeout=360., - retry_interval=5., + retry_interval=3., consistent_sleep=5., consistent_count=5,): # the following dict of agents is obtained when: diff --git a/tobiko/openstack/topology/_namespace.py b/tobiko/openstack/topology/_namespace.py index b625e1016..c5f870dd8 100644 --- a/tobiko/openstack/topology/_namespace.py +++ b/tobiko/openstack/topology/_namespace.py @@ -1,4 +1,4 @@ -# Copyright 2022 Red Hat +# Copyright 2021 Red Hat # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain @@ -48,7 +48,7 @@ def wait_for_namespace_in_hosts(*namespaces: str, count=count, interval=interval, default_timeout=60., - default_interval=5.): + default_interval=3.): try: if present: assert_namespace_in_hosts(*namespaces, diff --git a/tobiko/tests/faults/ha/test_cloud_recovery.py b/tobiko/tests/faults/ha/test_cloud_recovery.py index 7885e1f47..ead0d10e9 100644 --- a/tobiko/tests/faults/ha/test_cloud_recovery.py +++ b/tobiko/tests/faults/ha/test_cloud_recovery.py @@ -105,11 +105,11 @@ def octavia_health_checks(): LOG.debug("check all LBs are in healthy status") for lb in octavia.list_load_balancers(): LOG.debug("checkin LBs:\n%s", lb) - octavia.wait_for_status(lb['id'], interval=5., timeout=120.) + octavia.wait_for_status(lb['id'], interval=3., timeout=120.) octavia.wait_for_status(lb['id'], status_key=octavia.OPERATING_STATUS, status=octavia.ONLINE, - interval=5., + interval=3., timeout=120.) LOG.debug("All LBs are in healthy status") diff --git a/tobiko/tests/faults/neutron/test_agents.py b/tobiko/tests/faults/neutron/test_agents.py index a7171679f..d0285a762 100644 --- a/tobiko/tests/faults/neutron/test_agents.py +++ b/tobiko/tests/faults/neutron/test_agents.py @@ -450,7 +450,7 @@ class L3AgentTest(BaseAgentTest): def wait_for_active_ha_l3_agent(self) -> AgentType: ha_router_id = self.ha_stack.network_stack.gateway_id - for attempt in tobiko.retry(timeout=180., interval=5.): + for attempt in tobiko.retry(timeout=180., interval=3.): agents = neutron.list_l3_agent_hosting_routers(ha_router_id) try: active_agent = agents.with_items(ha_state='active').unique diff --git a/tobiko/tests/functional/openstack/test_topology.py b/tobiko/tests/functional/openstack/test_topology.py index dd319d05a..251dcce96 100644 --- a/tobiko/tests/functional/openstack/test_topology.py +++ b/tobiko/tests/functional/openstack/test_topology.py @@ -165,7 +165,7 @@ class OpenStackTopologyTest(testtools.TestCase): # Process isn't listed after kill processes.unique.kill() - for attempt in tobiko.retry(timeout=30., interval=5.): + for attempt in tobiko.retry(timeout=30., interval=3.): processes = osp_topology.list_nodes_processes( command_line=command_line, hostnames=[node.hostname])