diff options
author | Joe Gordon <jogo@cloudscaling.com> | 2012-07-25 16:33:17 -0700 |
---|---|---|
committer | Joe Gordon <jogo@cloudscaling.com> | 2012-07-25 17:26:05 -0700 |
commit | 2aaa3d2860eed7574c5df64a8ceeb8a6adf23460 (patch) | |
tree | 822e1e3b3b59cd798d414a3b8ea11e8f94be61bc /nova/tests/scheduler | |
parent | 9072290b22732f29152cca1bff54c7a0af5643f7 (diff) | |
download | nova-2aaa3d2860eed7574c5df64a8ceeb8a6adf23460.tar.gz nova-2aaa3d2860eed7574c5df64a8ceeb8a6adf23460.tar.xz nova-2aaa3d2860eed7574c5df64a8ceeb8a6adf23460.zip |
Remove unused scheduler functions
* get_service_capabilities
* get_host_list
* host_service_caps_stale
* delete_expired_host_services
The functions were introduced in d328ddcadb24d1b1961bd05a7676bc8f54b6776f
but are currently unused outside of nova.tests
Change-Id: I15388db5eb684a9f5cfe74f4c2a32b6c87f57894
Diffstat (limited to 'nova/tests/scheduler')
-rw-r--r-- | nova/tests/scheduler/fakes.py | 8 | ||||
-rw-r--r-- | nova/tests/scheduler/test_host_manager.py | 114 | ||||
-rw-r--r-- | nova/tests/scheduler/test_rpcapi.py | 3 | ||||
-rw-r--r-- | nova/tests/scheduler/test_scheduler.py | 44 |
4 files changed, 0 insertions, 169 deletions
diff --git a/nova/tests/scheduler/fakes.py b/nova/tests/scheduler/fakes.py index 29d4807ac..84424c1c7 100644 --- a/nova/tests/scheduler/fakes.py +++ b/nova/tests/scheduler/fakes.py @@ -86,14 +86,6 @@ class FakeHostManager(host_manager.HostManager): }, } - def get_host_list_from_db(self, context): - return [ - ('host1', dict(free_disk_gb=1024, free_ram_mb=1024)), - ('host2', dict(free_disk_gb=2048, free_ram_mb=2048)), - ('host3', dict(free_disk_gb=4096, free_ram_mb=4096)), - ('host4', dict(free_disk_gb=8192, free_ram_mb=8192)), - ] - class FakeHostState(host_manager.HostState): def __init__(self, host, topic, attribute_dict): diff --git a/nova/tests/scheduler/test_host_manager.py b/nova/tests/scheduler/test_host_manager.py index d28e51c00..01521c65d 100644 --- a/nova/tests/scheduler/test_host_manager.py +++ b/nova/tests/scheduler/test_host_manager.py @@ -122,120 +122,6 @@ class HostManagerTestCase(test.TestCase): 'host2': {'compute': host2_compute_capabs}} self.assertDictMatch(service_states, expected) - def test_host_service_caps_stale(self): - self.flags(periodic_interval=5) - - host1_compute_capabs = dict(free_memory=1234, host_memory=5678, - timestamp=datetime.datetime.fromtimestamp(3000)) - host1_volume_capabs = dict(free_disk=4321, - timestamp=datetime.datetime.fromtimestamp(3005)) - host2_compute_capabs = dict(free_memory=8756, - timestamp=datetime.datetime.fromtimestamp(3010)) - - service_states = {'host1': {'compute': host1_compute_capabs, - 'volume': host1_volume_capabs}, - 'host2': {'compute': host2_compute_capabs}} - - self.host_manager.service_states = service_states - - self.mox.StubOutWithMock(timeutils, 'utcnow') - timeutils.utcnow().AndReturn(datetime.datetime.fromtimestamp(3020)) - timeutils.utcnow().AndReturn(datetime.datetime.fromtimestamp(3020)) - timeutils.utcnow().AndReturn(datetime.datetime.fromtimestamp(3020)) - - self.mox.ReplayAll() - res1 = self.host_manager.host_service_caps_stale('host1', 'compute') - res2 = self.host_manager.host_service_caps_stale('host1', 'volume') - res3 = self.host_manager.host_service_caps_stale('host2', 'compute') - - self.assertEqual(res1, True) - self.assertEqual(res2, False) - self.assertEqual(res3, False) - - def test_delete_expired_host_services(self): - host1_compute_capabs = dict(free_memory=1234, host_memory=5678, - timestamp=datetime.datetime.fromtimestamp(3000)) - host1_volume_capabs = dict(free_disk=4321, - timestamp=datetime.datetime.fromtimestamp(3005)) - host2_compute_capabs = dict(free_memory=8756, - timestamp=datetime.datetime.fromtimestamp(3010)) - - service_states = {'host1': {'compute': host1_compute_capabs, - 'volume': host1_volume_capabs}, - 'host2': {'compute': host2_compute_capabs}} - self.host_manager.service_states = service_states - - to_delete = {'host1': {'volume': host1_volume_capabs}, - 'host2': {'compute': host2_compute_capabs}} - - self.host_manager.delete_expired_host_services(to_delete) - # Make sure dictionary isn't re-assigned - self.assertEqual(self.host_manager.service_states, service_states) - - expected = {'host1': {'compute': host1_compute_capabs}} - self.assertEqual(service_states, expected) - - def test_get_service_capabilities(self): - host1_compute_capabs = dict(free_memory=1000, host_memory=5678, - timestamp=datetime.datetime.fromtimestamp(3000)) - host1_volume_capabs = dict(free_disk=4321, - timestamp=datetime.datetime.fromtimestamp(3005)) - host2_compute_capabs = dict(free_memory=8756, - timestamp=datetime.datetime.fromtimestamp(3010)) - host2_volume_capabs = dict(free_disk=8756, - enabled=False, - timestamp=datetime.datetime.fromtimestamp(3010)) - host3_compute_capabs = dict(free_memory=1234, host_memory=4000, - timestamp=datetime.datetime.fromtimestamp(3010)) - host3_volume_capabs = dict(free_disk=2000, - timestamp=datetime.datetime.fromtimestamp(3010)) - - service_states = {'host1': {'compute': host1_compute_capabs, - 'volume': host1_volume_capabs}, - 'host2': {'compute': host2_compute_capabs, - 'volume': host2_volume_capabs}, - 'host3': {'compute': host3_compute_capabs, - 'volume': host3_volume_capabs}} - self.host_manager.service_states = service_states - - info = {'called': 0} - - # This tests with 1 volume disabled (host2), and 1 volume node - # as stale (host1) - def _fake_host_service_caps_stale(host, service): - info['called'] += 1 - if host == 'host1': - if service == 'compute': - return False - elif service == 'volume': - return True - elif host == 'host2': - # Shouldn't get here for 'volume' because the service - # is disabled - self.assertEqual(service, 'compute') - return False - self.assertEqual(host, 'host3') - return False - - self.stubs.Set(self.host_manager, 'host_service_caps_stale', - _fake_host_service_caps_stale) - - self.mox.StubOutWithMock(self.host_manager, - 'delete_expired_host_services') - self.host_manager.delete_expired_host_services({'host1': ['volume']}) - - self.mox.ReplayAll() - result = self.host_manager.get_service_capabilities() - - self.assertEqual(info['called'], 5) - - # only 1 volume node active == 'host3', so min/max is 2000 - expected = {'volume_free_disk': (2000, 2000), - 'compute_host_memory': (4000, 5678), - 'compute_free_memory': (1000, 8756)} - - self.assertDictMatch(result, expected) - def test_get_all_host_states(self): self.flags(reserved_host_memory_mb=512, reserved_host_disk_mb=1024) diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index cfd16a08b..000138bc9 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/nova/tests/scheduler/test_rpcapi.py @@ -100,6 +100,3 @@ class SchedulerRpcAPITestCase(test.TestCase): self._test_scheduler_api('update_service_capabilities', rpc_method='fanout_cast', service_name='fake_name', host='fake_host', capabilities='fake_capabilities') - - def test_get_host_list(self): - self._test_scheduler_api('get_host_list', rpc_method='call') diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index 38bdeeb40..7399d38d9 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -67,28 +67,6 @@ class SchedulerManagerTestCase(test.TestCase): manager = self.manager self.assertTrue(isinstance(manager.driver, self.driver_cls)) - def test_get_host_list(self): - expected = 'fake_hosts' - - self.mox.StubOutWithMock(self.manager.driver, 'get_host_list') - self.manager.driver.get_host_list().AndReturn(expected) - - self.mox.ReplayAll() - result = self.manager.get_host_list(self.context) - self.assertEqual(result, expected) - - def test_get_service_capabilities(self): - expected = 'fake_service_capabs' - - self.mox.StubOutWithMock(self.manager.driver, - 'get_service_capabilities') - self.manager.driver.get_service_capabilities().AndReturn( - expected) - - self.mox.ReplayAll() - result = self.manager.get_service_capabilities(self.context) - self.assertEqual(result, expected) - def test_update_service_capabilities(self): service_name = 'fake_service' host = 'fake_host' @@ -325,28 +303,6 @@ class SchedulerTestCase(test.TestCase): self.context = context.RequestContext('fake_user', 'fake_project') self.topic = 'fake_topic' - def test_get_host_list(self): - expected = 'fake_hosts' - - self.mox.StubOutWithMock(self.driver.host_manager, 'get_host_list') - self.driver.host_manager.get_host_list().AndReturn(expected) - - self.mox.ReplayAll() - result = self.driver.get_host_list() - self.assertEqual(result, expected) - - def test_get_service_capabilities(self): - expected = 'fake_service_capabs' - - self.mox.StubOutWithMock(self.driver.host_manager, - 'get_service_capabilities') - self.driver.host_manager.get_service_capabilities().AndReturn( - expected) - - self.mox.ReplayAll() - result = self.driver.get_service_capabilities() - self.assertEqual(result, expected) - def test_update_service_capabilities(self): service_name = 'fake_service' host = 'fake_host' |