openstack
/
rally-openstack
Code Issues Proposed changes

Merge "check the task state after creating image"

This commit is contained in:
Zuul 2019-08-02 14:21:22 +00:00 committed by Gerrit Code Review
parent 68f86c9447 0470f7ffbe
commit 6e44e22716
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rally_openstack/scenarios/nova/utils.py
View File

@ -514,6 +514,15 @@ class NovaScenario(scenario.OpenStackScenario):
timeout=CONF.openstack.nova_server_image_create_timeout,
check_interval=check_interval
)
with atomic.ActionTimer(self, "nova.wait_for_server"):
utils.wait_for_status(
server,
ready_statuses=["None"],
status_attr="OS-EXT-STS:task_state",
update_resource=utils.get_from_manager(),
timeout=CONF.openstack.nova_server_image_create_timeout,
check_interval=check_interval
)
return image
@atomic.action_timer("nova.get_keypair")

24
tests/unit/scenarios/nova/test_utils.py
View File

@ -236,13 +236,23 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
glance.get_image.return_value = self.image
nova_scenario = utils.NovaScenario(context=self.context)
return_image = nova_scenario._create_image(self.server)
self.mock_wait_for_status.mock.assert_called_once_with(
self.image,
ready_statuses=["ACTIVE"],
update_resource=glance.get_image,
check_interval=CONF.openstack.
nova_server_image_create_poll_interval,
timeout=CONF.openstack.nova_server_image_create_timeout)
self.mock_wait_for_status.mock.assert_has_calls([
mock.call(
self.image,
ready_statuses=["ACTIVE"],
update_resource=glance.get_image,
check_interval=CONF.openstack.
nova_server_image_create_poll_interval,
timeout=CONF.openstack.nova_server_image_create_timeout),
mock.call(
self.server,
ready_statuses=["None"],
status_attr="OS-EXT-STS:task_state",
update_resource=self.mock_get_from_manager.mock.return_value,
check_interval=CONF.openstack.
nova_server_image_create_poll_interval,
timeout=CONF.openstack.nova_server_image_create_timeout)
])
self.assertEqual(self.mock_wait_for_status.mock.return_value,
return_image)
self._test_atomic_action_timer(nova_scenario.atomic_actions(),