openstack
/
rally-openstack
Code Issues Proposed changes

[heat] Add "ERROR" status in wait_for 

Error is valied status of heat operations, if we don't add it
it can cause 10 minutes of rechecks of ERROR status which is not good

Change-Id: Ibb2026eef0eef2649a3ae1dd5c64ab90cbe2a3b2
This commit is contained in:
Boris Pavlovic 2017-10-05 23:48:00 -07:00
parent 840de23dc6
commit 1d4867b211
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rally/plugins/openstack/scenarios/heat/utils.py
View File

@ -70,7 +70,7 @@ class HeatScenario(scenario.OpenStackScenario):
stack = utils.wait_for(
stack,
ready_statuses=["CREATE_COMPLETE"],
failure_statuses=["CREATE_FAILED"],
failure_statuses=["CREATE_FAILED", "ERROR"],
update_resource=utils.get_from_manager(),
timeout=CONF.benchmark.heat_stack_create_timeout,
check_interval=CONF.benchmark.heat_stack_create_poll_interval)
@ -106,7 +106,7 @@ class HeatScenario(scenario.OpenStackScenario):
stack = utils.wait_for(
stack,
ready_statuses=["UPDATE_COMPLETE"],
failure_statuses=["UPDATE_FAILED"],
failure_statuses=["UPDATE_FAILED", "ERROR"],
update_resource=utils.get_from_manager(),
timeout=CONF.benchmark.heat_stack_update_timeout,
check_interval=CONF.benchmark.heat_stack_update_poll_interval)
@ -124,7 +124,7 @@ class HeatScenario(scenario.OpenStackScenario):
utils.wait_for(
stack,
ready_statuses=["CHECK_COMPLETE"],
failure_statuses=["CHECK_FAILED"],
failure_statuses=["CHECK_FAILED", "ERROR"],
update_resource=utils.get_from_manager(["CHECK_FAILED"]),
timeout=CONF.benchmark.heat_stack_check_timeout,
check_interval=CONF.benchmark.heat_stack_check_poll_interval)
@ -141,7 +141,7 @@ class HeatScenario(scenario.OpenStackScenario):
utils.wait_for_status(
stack,
ready_statuses=["DELETE_COMPLETE"],
failure_statuses=["DELETE_FAILED"],
failure_statuses=["DELETE_FAILED", "ERROR"],
check_deletion=True,
update_resource=utils.get_from_manager(),
timeout=CONF.benchmark.heat_stack_delete_timeout,
@ -158,7 +158,7 @@ class HeatScenario(scenario.OpenStackScenario):
utils.wait_for(
stack,
ready_statuses=["SUSPEND_COMPLETE"],
failure_statuses=["SUSPEND_FAILED"],
failure_statuses=["SUSPEND_FAILED", "ERROR"],
update_resource=utils.get_from_manager(),
timeout=CONF.benchmark.heat_stack_suspend_timeout,
check_interval=CONF.benchmark.heat_stack_suspend_poll_interval)
@ -174,7 +174,7 @@ class HeatScenario(scenario.OpenStackScenario):
utils.wait_for(
stack,
ready_statuses=["RESUME_COMPLETE"],
failure_statuses=["RESUME_FAILED"],
failure_statuses=["RESUME_FAILED", "ERROR"],
update_resource=utils.get_from_manager(),
timeout=CONF.benchmark.heat_stack_resume_timeout,
check_interval=CONF.benchmark.heat_stack_resume_poll_interval)
@ -191,7 +191,7 @@ class HeatScenario(scenario.OpenStackScenario):
utils.wait_for(
stack,
ready_statuses=["SNAPSHOT_COMPLETE"],
failure_statuses=["SNAPSHOT_FAILED"],
failure_statuses=["SNAPSHOT_FAILED", "ERROR"],
update_resource=utils.get_from_manager(),
timeout=CONF.benchmark.heat_stack_snapshot_timeout,
check_interval=CONF.benchmark.heat_stack_snapshot_poll_interval)
@ -208,7 +208,7 @@ class HeatScenario(scenario.OpenStackScenario):
utils.wait_for(
stack,
ready_statuses=["RESTORE_COMPLETE"],
failure_statuses=["RESTORE_FAILED"],
failure_statuses=["RESTORE_FAILED", "ERROR"],
update_resource=utils.get_from_manager(),
timeout=CONF.benchmark.heat_stack_restore_timeout,
check_interval=CONF.benchmark.heat_stack_restore_poll_interval
@ -300,7 +300,7 @@ class HeatScenario(scenario.OpenStackScenario):
stack,
is_ready=lambda s: (
self._count_instances(s) == expected_instances),
failure_statuses=["UPDATE_FAILED"],
failure_statuses=["UPDATE_FAILED", "ERROR"],
update_resource=utils.get_from_manager(),
timeout=CONF.benchmark.heat_stack_scale_timeout,
check_interval=CONF.benchmark.heat_stack_scale_poll_interval)

18
tests/unit/plugins/openstack/scenarios/heat/test_utils.py
View File

@ -62,7 +62,7 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
self.stack,
update_resource=self.mock_get_from_manager.mock.return_value,
ready_statuses=["CREATE_COMPLETE"],
failure_statuses=["CREATE_FAILED"],
failure_statuses=["CREATE_FAILED", "ERROR"],
check_interval=CONF.benchmark.heat_stack_create_poll_interval,
timeout=CONF.benchmark.heat_stack_create_timeout)
self.mock_get_from_manager.mock.assert_called_once_with()
@ -86,7 +86,7 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
self.stack,
update_resource=self.mock_get_from_manager.mock.return_value,
ready_statuses=["UPDATE_COMPLETE"],
failure_statuses=["UPDATE_FAILED"],
failure_statuses=["UPDATE_FAILED", "ERROR"],
check_interval=CONF.benchmark.heat_stack_update_poll_interval,
timeout=CONF.benchmark.heat_stack_update_timeout)
self.mock_get_from_manager.mock.assert_called_once_with()
@ -102,7 +102,7 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
self.stack,
update_resource=self.mock_get_from_manager.mock.return_value,
ready_statuses=["CHECK_COMPLETE"],
failure_statuses=["CHECK_FAILED"],
failure_statuses=["CHECK_FAILED", "ERROR"],
check_interval=CONF.benchmark.heat_stack_check_poll_interval,
timeout=CONF.benchmark.heat_stack_check_timeout)
self._test_atomic_action_timer(scenario.atomic_actions(),
@ -115,7 +115,7 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
self.mock_wait_for_status.mock.assert_called_once_with(
self.stack,
ready_statuses=["DELETE_COMPLETE"],
failure_statuses=["DELETE_FAILED"],
failure_statuses=["DELETE_FAILED", "ERROR"],
check_deletion=True,
update_resource=self.mock_get_from_manager.mock.return_value,
check_interval=CONF.benchmark.heat_stack_delete_poll_interval,
@ -133,7 +133,7 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
self.stack,
update_resource=self.mock_get_from_manager.mock.return_value,
ready_statuses=["SUSPEND_COMPLETE"],
failure_statuses=["SUSPEND_FAILED"],
failure_statuses=["SUSPEND_FAILED", "ERROR"],
check_interval=CONF.benchmark.heat_stack_suspend_poll_interval,
timeout=CONF.benchmark.heat_stack_suspend_timeout)
self.mock_get_from_manager.mock.assert_called_once_with()
@ -149,7 +149,7 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
self.stack,
update_resource=self.mock_get_from_manager.mock.return_value,
ready_statuses=["RESUME_COMPLETE"],
failure_statuses=["RESUME_FAILED"],
failure_statuses=["RESUME_FAILED", "ERROR"],
check_interval=CONF.benchmark.heat_stack_resume_poll_interval,
timeout=CONF.benchmark.heat_stack_resume_timeout)
self.mock_get_from_manager.mock.assert_called_once_with()
@ -165,7 +165,7 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
self.stack,
update_resource=self.mock_get_from_manager.mock.return_value,
ready_statuses=["SNAPSHOT_COMPLETE"],
failure_statuses=["SNAPSHOT_FAILED"],
failure_statuses=["SNAPSHOT_FAILED", "ERROR"],
check_interval=CONF.benchmark.heat_stack_snapshot_poll_interval,
timeout=CONF.benchmark.heat_stack_snapshot_timeout)
self.mock_get_from_manager.mock.assert_called_once_with()
@ -181,7 +181,7 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
self.stack,
update_resource=self.mock_get_from_manager.mock.return_value,
ready_statuses=["RESTORE_COMPLETE"],
failure_statuses=["RESTORE_FAILED"],
failure_statuses=["RESTORE_FAILED", "ERROR"],
check_interval=CONF.benchmark.heat_stack_restore_poll_interval,
timeout=CONF.benchmark.heat_stack_restore_timeout)
self.mock_get_from_manager.mock.assert_called_once_with()
@ -211,7 +211,7 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
self.mock_wait_for.mock.assert_called_once_with(
self.stack,
is_ready=mock.ANY,
failure_statuses=["UPDATE_FAILED"],
failure_statuses=["UPDATE_FAILED", "ERROR"],
update_resource=self.mock_get_from_manager.mock.return_value,
timeout=CONF.benchmark.heat_stack_scale_timeout,
check_interval=CONF.benchmark.heat_stack_scale_poll_interval)