openstack/rally-openstack
Code Issues Proposed changes

Merge "Update wait_for to wait_for_status"

Browse Source
This commit is contained in:
Jenkins 2016-11-12 16:41:41 +00:00 committed by Gerrit Code Review
commit 647483b8a9
2 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
rally/plugins/openstack/scenarios/nova/utils.py
View File

@ -138,7 +138,7 @@ class NovaScenario(scenario.OpenStackScenario):
server_name, image_id, flavor_id, **kwargs) server_name, image_id, flavor_id, **kwargs)
self.sleep_between(CONF.benchmark.nova_server_boot_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_boot_prepoll_delay)
server = utils.wait_for( server = utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -150,7 +150,7 @@ class NovaScenario(scenario.OpenStackScenario):
def _do_server_reboot(self, server, reboottype): def _do_server_reboot(self, server, reboottype):
server.reboot(reboot_type=reboottype) server.reboot(reboot_type=reboottype)
self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -212,7 +212,7 @@ class NovaScenario(scenario.OpenStackScenario):
""" """
server.rebuild(image, **kwargs) server.rebuild(image, **kwargs)
self.sleep_between(CONF.benchmark.nova_server_rebuild_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_rebuild_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -230,7 +230,7 @@ class NovaScenario(scenario.OpenStackScenario):
:param server: The server to start and wait to become ACTIVE. :param server: The server to start and wait to become ACTIVE.
""" """
server.start() server.start()
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -248,7 +248,7 @@ class NovaScenario(scenario.OpenStackScenario):
:param server: The server to stop. :param server: The server to stop.
""" """
server.stop() server.stop()
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["SHUTOFF"], ready_statuses=["SHUTOFF"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -267,7 +267,7 @@ class NovaScenario(scenario.OpenStackScenario):
""" """
server.rescue() server.rescue()
self.sleep_between(CONF.benchmark.nova_server_rescue_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_rescue_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["RESCUE"], ready_statuses=["RESCUE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -285,7 +285,7 @@ class NovaScenario(scenario.OpenStackScenario):
""" """
server.unrescue() server.unrescue()
self.sleep_between(CONF.benchmark.nova_server_unrescue_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_unrescue_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -304,7 +304,7 @@ class NovaScenario(scenario.OpenStackScenario):
""" """
server.suspend() server.suspend()
self.sleep_between(CONF.benchmark.nova_server_suspend_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_suspend_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["SUSPENDED"], ready_statuses=["SUSPENDED"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -323,7 +323,7 @@ class NovaScenario(scenario.OpenStackScenario):
""" """
server.resume() server.resume()
self.sleep_between(CONF.benchmark.nova_server_resume_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_resume_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -342,7 +342,7 @@ class NovaScenario(scenario.OpenStackScenario):
""" """
server.pause() server.pause()
self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["PAUSED"], ready_statuses=["PAUSED"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -361,7 +361,7 @@ class NovaScenario(scenario.OpenStackScenario):
""" """
server.unpause() server.unpause()
self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -380,7 +380,7 @@ class NovaScenario(scenario.OpenStackScenario):
""" """
server.shelve() server.shelve()
self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["SHELVED_OFFLOADED"], ready_statuses=["SHELVED_OFFLOADED"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -399,7 +399,7 @@ class NovaScenario(scenario.OpenStackScenario):
server.unshelve() server.unshelve()
self.sleep_between(CONF.benchmark. nova_server_unshelve_prepoll_delay) self.sleep_between(CONF.benchmark. nova_server_unshelve_prepoll_delay)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -491,7 +491,7 @@ class NovaScenario(scenario.OpenStackScenario):
server.name) server.name)
image = self.clients("nova").images.get(image_uuid) image = self.clients("nova").images.get(image_uuid)
check_interval = CONF.benchmark.nova_server_image_create_poll_interval check_interval = CONF.benchmark.nova_server_image_create_poll_interval
image = utils.wait_for( image = utils.wait_for_status(
image, image,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -570,7 +570,7 @@ class NovaScenario(scenario.OpenStackScenario):
servers = [s for s in self.clients("nova").servers.list() servers = [s for s in self.clients("nova").servers.list()
if s.name.startswith(name_prefix)] if s.name.startswith(name_prefix)]
self.sleep_between(CONF.benchmark.nova_server_boot_prepoll_delay) self.sleep_between(CONF.benchmark.nova_server_boot_prepoll_delay)
servers = [utils.wait_for( servers = [utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils. update_resource=utils.
@ -638,7 +638,7 @@ class NovaScenario(scenario.OpenStackScenario):
@atomic.action_timer("nova.resize") @atomic.action_timer("nova.resize")
def _resize(self, server, flavor): def _resize(self, server, flavor):
server.resize(flavor) server.resize(flavor)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["VERIFY_RESIZE"], ready_statuses=["VERIFY_RESIZE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -649,7 +649,7 @@ class NovaScenario(scenario.OpenStackScenario):
@atomic.action_timer("nova.resize_confirm") @atomic.action_timer("nova.resize_confirm")
def _resize_confirm(self, server, status="ACTIVE"): def _resize_confirm(self, server, status="ACTIVE"):
server.confirm_resize() server.confirm_resize()
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=[status], ready_statuses=[status],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -661,7 +661,7 @@ class NovaScenario(scenario.OpenStackScenario):
@atomic.action_timer("nova.resize_revert") @atomic.action_timer("nova.resize_revert")
def _resize_revert(self, server, status="ACTIVE"): def _resize_revert(self, server, status="ACTIVE"):
server.revert_resize() server.revert_resize()
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=[status], ready_statuses=[status],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -676,7 +676,7 @@ class NovaScenario(scenario.OpenStackScenario):
volume_id = volume.id volume_id = volume.id
attachment = self.clients("nova").volumes.create_server_volume( attachment = self.clients("nova").volumes.create_server_volume(
server_id, volume_id, device) server_id, volume_id, device)
utils.wait_for( utils.wait_for_status(
volume, volume,
ready_statuses=["in-use"], ready_statuses=["in-use"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -695,7 +695,7 @@ class NovaScenario(scenario.OpenStackScenario):
self.clients("nova").volumes.delete_server_volume(server_id, self.clients("nova").volumes.delete_server_volume(server_id,
attachment_id) attachment_id)
utils.wait_for( utils.wait_for_status(
volume, volume,
ready_statuses=["available"], ready_statuses=["available"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -721,7 +721,7 @@ class NovaScenario(scenario.OpenStackScenario):
server_admin.live_migrate(target_host, server_admin.live_migrate(target_host,
block_migration=block_migration, block_migration=block_migration,
disk_over_commit=disk_over_commit) disk_over_commit=disk_over_commit)
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),
@ -771,7 +771,7 @@ class NovaScenario(scenario.OpenStackScenario):
server_admin = self.admin_clients("nova").servers.get(server.id) server_admin = self.admin_clients("nova").servers.get(server.id)
host_pre_migrate = getattr(server_admin, "OS-EXT-SRV-ATTR:host") host_pre_migrate = getattr(server_admin, "OS-EXT-SRV-ATTR:host")
server_admin.migrate() server_admin.migrate()
utils.wait_for( utils.wait_for_status(
server, server,
ready_statuses=["VERIFY_RESIZE"], ready_statuses=["VERIFY_RESIZE"],
update_resource=utils.get_from_manager(), update_resource=utils.get_from_manager(),

46
tests/unit/plugins/openstack/scenarios/nova/test_utils.py
View File

@ -108,14 +108,15 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
kwargs["fakearg"] = "fakearg" kwargs["fakearg"] = "fakearg"
return_server = nova_scenario._boot_server("image_id", "flavor_id", return_server = nova_scenario._boot_server("image_id", "flavor_id",
**kwargs) **kwargs)
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
check_interval=CONF.benchmark.nova_server_boot_poll_interval, check_interval=CONF.benchmark.nova_server_boot_poll_interval,
timeout=CONF.benchmark.nova_server_boot_timeout) timeout=CONF.benchmark.nova_server_boot_timeout)
self.mock_get_from_manager.mock.assert_called_once_with() self.mock_get_from_manager.mock.assert_called_once_with()
self.assertEqual(self.mock_wait_for.mock.return_value, return_server) self.assertEqual(self.mock_wait_for_status.mock.return_value,
return_server)
expected_kwargs = {"fakearg": "fakearg"} expected_kwargs = {"fakearg": "fakearg"}
if "nics" in kwargs: if "nics" in kwargs:
@ -150,7 +151,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._suspend_server(self.server) nova_scenario._suspend_server(self.server)
self.server.suspend.assert_called_once_with() self.server.suspend.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["SUSPENDED"], ready_statuses=["SUSPENDED"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -164,7 +165,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._resume_server(self.server) nova_scenario._resume_server(self.server)
self.server.resume.assert_called_once_with() self.server.resume.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -178,7 +179,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._pause_server(self.server) nova_scenario._pause_server(self.server)
self.server.pause.assert_called_once_with() self.server.pause.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["PAUSED"], ready_statuses=["PAUSED"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -192,7 +193,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._unpause_server(self.server) nova_scenario._unpause_server(self.server)
self.server.unpause.assert_called_once_with() self.server.unpause.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -206,7 +207,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._shelve_server(self.server) nova_scenario._shelve_server(self.server)
self.server.shelve.assert_called_once_with() self.server.shelve.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["SHELVED_OFFLOADED"], ready_statuses=["SHELVED_OFFLOADED"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -220,7 +221,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._unshelve_server(self.server) nova_scenario._unshelve_server(self.server)
self.server.unshelve.assert_called_once_with() self.server.unshelve.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -234,7 +235,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
self.clients("nova").images.get.return_value = self.image self.clients("nova").images.get.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.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.image, self.image,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -242,7 +243,8 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_server_image_create_poll_interval, nova_server_image_create_poll_interval,
timeout=CONF.benchmark.nova_server_image_create_timeout) timeout=CONF.benchmark.nova_server_image_create_timeout)
self.mock_get_from_manager.mock.assert_called_once_with() self.mock_get_from_manager.mock.assert_called_once_with()
self.assertEqual(self.mock_wait_for.mock.return_value, return_image) self.assertEqual(self.mock_wait_for_status.mock.return_value,
return_image)
self._test_atomic_action_timer(nova_scenario.atomic_actions(), self._test_atomic_action_timer(nova_scenario.atomic_actions(),
"nova.create_image") "nova.create_image")
@ -280,7 +282,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._reboot_server(self.server) nova_scenario._reboot_server(self.server)
self.server.reboot.assert_called_once_with(reboot_type="HARD") self.server.reboot.assert_called_once_with(reboot_type="HARD")
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -294,7 +296,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._soft_reboot_server(self.server) nova_scenario._soft_reboot_server(self.server)
self.server.reboot.assert_called_once_with(reboot_type="SOFT") self.server.reboot.assert_called_once_with(reboot_type="SOFT")
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -308,7 +310,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._rebuild_server(self.server, "img", fakearg="fakearg") nova_scenario._rebuild_server(self.server, "img", fakearg="fakearg")
self.server.rebuild.assert_called_once_with("img", fakearg="fakearg") self.server.rebuild.assert_called_once_with("img", fakearg="fakearg")
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -322,7 +324,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._start_server(self.server) nova_scenario._start_server(self.server)
self.server.start.assert_called_once_with() self.server.start.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -336,7 +338,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._stop_server(self.server) nova_scenario._stop_server(self.server)
self.server.stop.assert_called_once_with() self.server.stop.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["SHUTOFF"], ready_statuses=["SHUTOFF"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -350,7 +352,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._rescue_server(self.server) nova_scenario._rescue_server(self.server)
self.server.rescue.assert_called_once_with() self.server.rescue.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["RESCUE"], ready_statuses=["RESCUE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -364,7 +366,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._unrescue_server(self.server) nova_scenario._unrescue_server(self.server)
self.server.unrescue.assert_called_once_with() self.server.unrescue.assert_called_once_with()
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -459,7 +461,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
for i in range(requests)] for i in range(requests)]
self.clients("nova").servers.create.assert_has_calls(create_calls) self.clients("nova").servers.create.assert_has_calls(create_calls)
wait_for_calls = [ wait_for_status_calls = [
mock.call( mock.call(
servers[i], servers[i],
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
@ -467,7 +469,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
check_interval=CONF.benchmark.nova_server_boot_poll_interval, check_interval=CONF.benchmark.nova_server_boot_poll_interval,
timeout=CONF.benchmark.nova_server_boot_timeout) timeout=CONF.benchmark.nova_server_boot_timeout)
for i in range(instances_amount)] for i in range(instances_amount)]
self.mock_wait_for.mock.assert_has_calls(wait_for_calls) self.mock_wait_for_status.mock.assert_has_calls(wait_for_status_calls)
self.mock_get_from_manager.mock.assert_has_calls( self.mock_get_from_manager.mock.assert_has_calls(
[mock.call() for i in range(instances_amount)]) [mock.call() for i in range(instances_amount)])
@ -584,7 +586,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
status = "ACTIVE" status = "ACTIVE"
else: else:
nova_scenario._resize_revert(self.server, status=status) nova_scenario._resize_revert(self.server, status=status)
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=[status], ready_statuses=[status],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -636,7 +638,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
disk_over_commit=False, disk_over_commit=False,
skip_host_check=True) skip_host_check=True)
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
self.server, self.server,
ready_statuses=["ACTIVE"], ready_statuses=["ACTIVE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,
@ -679,7 +681,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase):
nova_scenario = utils.NovaScenario(context=self.context) nova_scenario = utils.NovaScenario(context=self.context)
nova_scenario._migrate(fake_server, skip_host_check=True) nova_scenario._migrate(fake_server, skip_host_check=True)
self.mock_wait_for.mock.assert_called_once_with( self.mock_wait_for_status.mock.assert_called_once_with(
fake_server, fake_server,
ready_statuses=["VERIFY_RESIZE"], ready_statuses=["VERIFY_RESIZE"],
update_resource=self.mock_get_from_manager.mock.return_value, update_resource=self.mock_get_from_manager.mock.return_value,