openstack
/
rally-openstack
Code Issues Proposed changes

Revert "[CI] Unblock CI by introducing Nova VMs cleanup bug" 

This reverts commit 30294bcafd6310280fadf6c4ea1e68bd9c38d4b1.

Depends-On: Ida446acb1286a8b215451a5d8d7d23882643ef13
Change-Id: Ie6558af5cd4363a7928c01d546d144bec8dbbfaa
This commit is contained in:
Boris Pavlovic 2017-10-05 15:54:29 -07:00 committed by Andrey Kurilin
parent 20f7e89d69
commit f2210a84f4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rally/plugins/openstack/cleanup/resources.py
View File

@ -154,8 +154,7 @@ _nova_order = get_order(200)
class NovaServer(base.ResourceManager):
def list(self):
"""List all servers."""
# FIX(boris-42): Use limit=-1 when it's fixed
return self._manager().list()
return self._manager().list(limit=-1)
def delete(self):
if getattr(self.raw_resource, "OS-EXT-STS:locked", False):

2
tests/unit/plugins/openstack/cleanup/test_resources.py
View File

@ -84,7 +84,7 @@ class NovaServerTestCase(test.TestCase):
server.list()
server._manager.return_value.list.assert_called_once_with()
server._manager.return_value.list.assert_called_once_with(limit=-1)
def test_delete(self):
server = resources.NovaServer()