Merge "check the task state after creating image"
This commit is contained in:
commit
6e44e22716
|
@ -514,6 +514,15 @@ class NovaScenario(scenario.OpenStackScenario):
|
||||||
timeout=CONF.openstack.nova_server_image_create_timeout,
|
timeout=CONF.openstack.nova_server_image_create_timeout,
|
||||||
check_interval=check_interval
|
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
|
return image
|
||||||
|
|
||||||
@atomic.action_timer("nova.get_keypair")
|
@atomic.action_timer("nova.get_keypair")
|
||||||
|
|
|
@ -236,13 +236,23 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
|
||||||
glance.get_image.return_value = self.image
|
glance.get_image.return_value = self.image
|
||||||
nova_scenario = utils.NovaScenario(context=self.context)
|
nova_scenario = utils.NovaScenario(context=self.context)
|
||||||
return_image = nova_scenario._create_image(self.server)
|
return_image = nova_scenario._create_image(self.server)
|
||||||
self.mock_wait_for_status.mock.assert_called_once_with(
|
self.mock_wait_for_status.mock.assert_has_calls([
|
||||||
self.image,
|
mock.call(
|
||||||
ready_statuses=["ACTIVE"],
|
self.image,
|
||||||
update_resource=glance.get_image,
|
ready_statuses=["ACTIVE"],
|
||||||
check_interval=CONF.openstack.
|
update_resource=glance.get_image,
|
||||||
nova_server_image_create_poll_interval,
|
check_interval=CONF.openstack.
|
||||||
timeout=CONF.openstack.nova_server_image_create_timeout)
|
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,
|
self.assertEqual(self.mock_wait_for_status.mock.return_value,
|
||||||
return_image)
|
return_image)
|
||||||
self._test_atomic_action_timer(nova_scenario.atomic_actions(),
|
self._test_atomic_action_timer(nova_scenario.atomic_actions(),
|
||||||
|
|
Loading…
Reference in New Issue