From bb8de2e6bc9268e2eccd6077b24b7255627b87a3 Mon Sep 17 00:00:00 2001 From: zhangzhang Date: Mon, 31 Oct 2016 23:19:29 -0400 Subject: [PATCH] Update wait_for to wait_for_status in nova/utils.py, update all wait_for to wait_for_status Change-Id: Ifd3d1ed6e13a16d6e0f9209809447c8926e267b8 --- .../plugins/openstack/scenarios/nova/utils.py | 44 +++++++++--------- .../openstack/scenarios/nova/test_utils.py | 46 ++++++++++--------- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/rally/plugins/openstack/scenarios/nova/utils.py b/rally/plugins/openstack/scenarios/nova/utils.py index fce8f21d..0b79de2d 100755 --- a/rally/plugins/openstack/scenarios/nova/utils.py +++ b/rally/plugins/openstack/scenarios/nova/utils.py @@ -138,7 +138,7 @@ class NovaScenario(scenario.OpenStackScenario): server_name, image_id, flavor_id, **kwargs) self.sleep_between(CONF.benchmark.nova_server_boot_prepoll_delay) - server = utils.wait_for( + server = utils.wait_for_status( server, ready_statuses=["ACTIVE"], update_resource=utils.get_from_manager(), @@ -150,7 +150,7 @@ class NovaScenario(scenario.OpenStackScenario): def _do_server_reboot(self, server, reboottype): server.reboot(reboot_type=reboottype) self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["ACTIVE"], update_resource=utils.get_from_manager(), @@ -212,7 +212,7 @@ class NovaScenario(scenario.OpenStackScenario): """ server.rebuild(image, **kwargs) self.sleep_between(CONF.benchmark.nova_server_rebuild_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["ACTIVE"], 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. """ server.start() - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["ACTIVE"], update_resource=utils.get_from_manager(), @@ -248,7 +248,7 @@ class NovaScenario(scenario.OpenStackScenario): :param server: The server to stop. """ server.stop() - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["SHUTOFF"], update_resource=utils.get_from_manager(), @@ -267,7 +267,7 @@ class NovaScenario(scenario.OpenStackScenario): """ server.rescue() self.sleep_between(CONF.benchmark.nova_server_rescue_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["RESCUE"], update_resource=utils.get_from_manager(), @@ -285,7 +285,7 @@ class NovaScenario(scenario.OpenStackScenario): """ server.unrescue() self.sleep_between(CONF.benchmark.nova_server_unrescue_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["ACTIVE"], update_resource=utils.get_from_manager(), @@ -304,7 +304,7 @@ class NovaScenario(scenario.OpenStackScenario): """ server.suspend() self.sleep_between(CONF.benchmark.nova_server_suspend_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["SUSPENDED"], update_resource=utils.get_from_manager(), @@ -323,7 +323,7 @@ class NovaScenario(scenario.OpenStackScenario): """ server.resume() self.sleep_between(CONF.benchmark.nova_server_resume_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["ACTIVE"], update_resource=utils.get_from_manager(), @@ -342,7 +342,7 @@ class NovaScenario(scenario.OpenStackScenario): """ server.pause() self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["PAUSED"], update_resource=utils.get_from_manager(), @@ -361,7 +361,7 @@ class NovaScenario(scenario.OpenStackScenario): """ server.unpause() self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["ACTIVE"], update_resource=utils.get_from_manager(), @@ -380,7 +380,7 @@ class NovaScenario(scenario.OpenStackScenario): """ server.shelve() self.sleep_between(CONF.benchmark.nova_server_pause_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["SHELVED_OFFLOADED"], update_resource=utils.get_from_manager(), @@ -399,7 +399,7 @@ class NovaScenario(scenario.OpenStackScenario): server.unshelve() self.sleep_between(CONF.benchmark. nova_server_unshelve_prepoll_delay) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["ACTIVE"], update_resource=utils.get_from_manager(), @@ -491,7 +491,7 @@ class NovaScenario(scenario.OpenStackScenario): server.name) image = self.clients("nova").images.get(image_uuid) check_interval = CONF.benchmark.nova_server_image_create_poll_interval - image = utils.wait_for( + image = utils.wait_for_status( image, ready_statuses=["ACTIVE"], update_resource=utils.get_from_manager(), @@ -570,7 +570,7 @@ class NovaScenario(scenario.OpenStackScenario): servers = [s for s in self.clients("nova").servers.list() if s.name.startswith(name_prefix)] self.sleep_between(CONF.benchmark.nova_server_boot_prepoll_delay) - servers = [utils.wait_for( + servers = [utils.wait_for_status( server, ready_statuses=["ACTIVE"], update_resource=utils. @@ -638,7 +638,7 @@ class NovaScenario(scenario.OpenStackScenario): @atomic.action_timer("nova.resize") def _resize(self, server, flavor): server.resize(flavor) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["VERIFY_RESIZE"], update_resource=utils.get_from_manager(), @@ -649,7 +649,7 @@ class NovaScenario(scenario.OpenStackScenario): @atomic.action_timer("nova.resize_confirm") def _resize_confirm(self, server, status="ACTIVE"): server.confirm_resize() - utils.wait_for( + utils.wait_for_status( server, ready_statuses=[status], update_resource=utils.get_from_manager(), @@ -661,7 +661,7 @@ class NovaScenario(scenario.OpenStackScenario): @atomic.action_timer("nova.resize_revert") def _resize_revert(self, server, status="ACTIVE"): server.revert_resize() - utils.wait_for( + utils.wait_for_status( server, ready_statuses=[status], update_resource=utils.get_from_manager(), @@ -676,7 +676,7 @@ class NovaScenario(scenario.OpenStackScenario): volume_id = volume.id attachment = self.clients("nova").volumes.create_server_volume( server_id, volume_id, device) - utils.wait_for( + utils.wait_for_status( volume, ready_statuses=["in-use"], update_resource=utils.get_from_manager(), @@ -695,7 +695,7 @@ class NovaScenario(scenario.OpenStackScenario): self.clients("nova").volumes.delete_server_volume(server_id, attachment_id) - utils.wait_for( + utils.wait_for_status( volume, ready_statuses=["available"], update_resource=utils.get_from_manager(), @@ -721,7 +721,7 @@ class NovaScenario(scenario.OpenStackScenario): server_admin.live_migrate(target_host, block_migration=block_migration, disk_over_commit=disk_over_commit) - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["ACTIVE"], update_resource=utils.get_from_manager(), @@ -771,7 +771,7 @@ class NovaScenario(scenario.OpenStackScenario): server_admin = self.admin_clients("nova").servers.get(server.id) host_pre_migrate = getattr(server_admin, "OS-EXT-SRV-ATTR:host") server_admin.migrate() - utils.wait_for( + utils.wait_for_status( server, ready_statuses=["VERIFY_RESIZE"], update_resource=utils.get_from_manager(), diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_utils.py b/tests/unit/plugins/openstack/scenarios/nova/test_utils.py index 6f39196c..be0d8c45 100755 --- a/tests/unit/plugins/openstack/scenarios/nova/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/nova/test_utils.py @@ -108,14 +108,15 @@ class NovaScenarioTestCase(test.ScenarioTestCase): kwargs["fakearg"] = "fakearg" return_server = nova_scenario._boot_server("image_id", "flavor_id", **kwargs) - self.mock_wait_for.mock.assert_called_once_with( + self.mock_wait_for_status.mock.assert_called_once_with( self.server, ready_statuses=["ACTIVE"], update_resource=self.mock_get_from_manager.mock.return_value, check_interval=CONF.benchmark.nova_server_boot_poll_interval, timeout=CONF.benchmark.nova_server_boot_timeout) 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"} if "nics" in kwargs: @@ -150,7 +151,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): nova_scenario = utils.NovaScenario(context=self.context) nova_scenario._suspend_server(self.server) 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, ready_statuses=["SUSPENDED"], 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._resume_server(self.server) 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, ready_statuses=["ACTIVE"], 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._pause_server(self.server) 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, ready_statuses=["PAUSED"], 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._unpause_server(self.server) 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, ready_statuses=["ACTIVE"], 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._shelve_server(self.server) 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, ready_statuses=["SHELVED_OFFLOADED"], 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._unshelve_server(self.server) 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, ready_statuses=["ACTIVE"], 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 nova_scenario = utils.NovaScenario(context=self.context) 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, ready_statuses=["ACTIVE"], update_resource=self.mock_get_from_manager.mock.return_value, @@ -242,7 +243,8 @@ class NovaScenarioTestCase(test.ScenarioTestCase): nova_server_image_create_poll_interval, timeout=CONF.benchmark.nova_server_image_create_timeout) 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(), "nova.create_image") @@ -280,7 +282,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): nova_scenario = utils.NovaScenario(context=self.context) nova_scenario._reboot_server(self.server) 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, ready_statuses=["ACTIVE"], 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._soft_reboot_server(self.server) 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, ready_statuses=["ACTIVE"], 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._rebuild_server(self.server, "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, ready_statuses=["ACTIVE"], 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._start_server(self.server) 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, ready_statuses=["ACTIVE"], 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._stop_server(self.server) 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, ready_statuses=["SHUTOFF"], 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._rescue_server(self.server) 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, ready_statuses=["RESCUE"], 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._unrescue_server(self.server) 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, ready_statuses=["ACTIVE"], update_resource=self.mock_get_from_manager.mock.return_value, @@ -459,7 +461,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): for i in range(requests)] self.clients("nova").servers.create.assert_has_calls(create_calls) - wait_for_calls = [ + wait_for_status_calls = [ mock.call( servers[i], ready_statuses=["ACTIVE"], @@ -467,7 +469,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): check_interval=CONF.benchmark.nova_server_boot_poll_interval, timeout=CONF.benchmark.nova_server_boot_timeout) 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( [mock.call() for i in range(instances_amount)]) @@ -584,7 +586,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): status = "ACTIVE" else: 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, ready_statuses=[status], update_resource=self.mock_get_from_manager.mock.return_value, @@ -636,7 +638,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): disk_over_commit=False, 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, ready_statuses=["ACTIVE"], 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._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, ready_statuses=["VERIFY_RESIZE"], update_resource=self.mock_get_from_manager.mock.return_value,