Merge "nova: Remove unused instance_get_all"
This commit is contained in:
commit
fe93e75fe9
@ -141,17 +141,3 @@ class Client(object):
|
||||
return self._with_flavor_and_image(self.nova_client.servers.list(
|
||||
detailed=True,
|
||||
search_opts=search_opts))
|
||||
|
||||
@logged
|
||||
def instance_get_all(self, since=None):
|
||||
"""Returns list of all instances.
|
||||
|
||||
If since is supplied, it will return the instances changes since that
|
||||
datetime. since should be in ISO Format '%Y-%m-%dT%H:%M:%SZ'
|
||||
"""
|
||||
search_opts = {'all_tenants': True}
|
||||
if since:
|
||||
search_opts['changes-since'] = since
|
||||
return self.nova_client.servers.list(
|
||||
detailed=True,
|
||||
search_opts=search_opts)
|
||||
|
@ -93,16 +93,6 @@ class TestNovaClient(base.BaseTestCase):
|
||||
self.assertEqual(11, instances[0].kernel_id)
|
||||
self.assertEqual(21, instances[0].ramdisk_id)
|
||||
|
||||
def test_instance_get_all(self):
|
||||
with mock.patch.object(self.nv.nova_client.servers, 'list',
|
||||
side_effect=self.fake_servers_list):
|
||||
instances = self.nv.instance_get_all()
|
||||
|
||||
self.assertEqual(2, len(instances))
|
||||
self.assertEqual(42, instances[0].id)
|
||||
self.assertEqual(1, instances[0].flavor['id'])
|
||||
self.assertEqual(1, instances[0].image['id'])
|
||||
|
||||
@staticmethod
|
||||
def fake_servers_list_unknown_flavor(*args, **kwargs):
|
||||
a = mock.MagicMock()
|
||||
|
Loading…
x
Reference in New Issue
Block a user