From 7b194b1f700e4c74f7ed39340284861b355338a5 Mon Sep 17 00:00:00 2001 From: Hai Shi Date: Fri, 17 Mar 2017 17:31:26 +0800 Subject: [PATCH] [cleanup] Remove old nova_client judge in NovaServer Because the minimun version requiremnt ofpython-novaclient, We could not judge the nova_client in NovaServer. Change-Id: I929f6e0dc9bbc99d0228e6ebf08d722c44947c5b --- rally/plugins/openstack/cleanup/resources.py | 23 +------------------ .../openstack/cleanup/test_resources.py | 15 ------------ 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/rally/plugins/openstack/cleanup/resources.py b/rally/plugins/openstack/cleanup/resources.py index 56d45216..d476d28f 100755 --- a/rally/plugins/openstack/cleanup/resources.py +++ b/rally/plugins/openstack/cleanup/resources.py @@ -151,28 +151,7 @@ _nova_order = get_order(200) class NovaServer(base.ResourceManager): def list(self): """List all servers.""" - - if hasattr(self._manager().api, "api_version"): - # NOTE(andreykurilin): novaclient v2.27.0 includes ability to - # return all servers(see https://review.openstack.org/#/c/217101 - # for more details). This release can be identified by presence - # of "api_version" property of ``novaclient.client.Client`` cls. - return self._manager().list(limit=-1) - else: - # FIXME(andreykurilin): Remove code below, when minimum version of - # novaclient in requirements will allow it. - # NOTE(andreykurilin): Nova API returns only limited number( - # 'osapi_max_limit' option in nova.conf) of servers, so we need - # to use 'marker' option to list all pages of servers. - result = [] - marker = None - while True: - servers = self._manager().list(marker=marker) - if not servers: - break - result.extend(servers) - marker = servers[-1].id - return result + return self._manager().list(limit=-1) def delete(self): if getattr(self.raw_resource, "OS-EXT-STS:locked", False): diff --git a/tests/unit/plugins/openstack/cleanup/test_resources.py b/tests/unit/plugins/openstack/cleanup/test_resources.py index 48019339..30bdf078 100755 --- a/tests/unit/plugins/openstack/cleanup/test_resources.py +++ b/tests/unit/plugins/openstack/cleanup/test_resources.py @@ -95,21 +95,6 @@ class NovaServerTestCase(test.TestCase): server._manager.return_value.list.assert_called_once_with(limit=-1) - def test_list_old_novaclient(self): - servers = [mock.MagicMock(), mock.MagicMock(), mock.MagicMock(), - mock.MagicMock()] - server = resources.NovaServer() - server._manager = mock.MagicMock() - server._manager.return_value.api = None - server._manager.return_value.list.side_effect = ( - servers[:2], servers[2:4], []) - - self.assertEqual(servers, server.list()) - self.assertEqual( - [mock.call(marker=None), mock.call(marker=servers[1].id), - mock.call(marker=servers[3].id)], - server._manager.return_value.list.call_args_list) - def test_delete(self): server = resources.NovaServer() server.raw_resource = mock.Mock()