openstack/nova
Code Issues Proposed changes

Merge "load ram_allocation_ratio when asked"

Browse Source
This commit is contained in:
Jenkins
2015-03-19 08:04:26 +00:00
committed by Gerrit Code Review
parent 99508fe8af 47e7963a89
commit b9b3b7f634
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/scheduler/filters/ram_filter.py
View File

@@ -67,10 +67,9 @@ class BaseRamFilter(filters.BaseHostFilter):
class RamFilter(BaseRamFilter): class RamFilter(BaseRamFilter):
"""Ram Filter with over subscription flag.""" """Ram Filter with over subscription flag."""
ram_allocation_ratio = CONF.ram_allocation_ratio
def _get_ram_allocation_ratio(self, host_state, filter_properties): def _get_ram_allocation_ratio(self, host_state, filter_properties):
return self.ram_allocation_ratio return CONF.ram_allocation_ratio
class AggregateRamFilter(BaseRamFilter): class AggregateRamFilter(BaseRamFilter):

6
nova/tests/unit/scheduler/filters/test_ram_filters.py
View File

@@ -24,21 +24,21 @@ class TestRamFilter(test.NoDBTestCase):
self.filt_cls = ram_filter.RamFilter() self.filt_cls = ram_filter.RamFilter()
def test_ram_filter_fails_on_memory(self): def test_ram_filter_fails_on_memory(self):
ram_filter.RamFilter.ram_allocation_ratio = 1.0 self.flags(ram_allocation_ratio=1.0)
filter_properties = {'instance_type': {'memory_mb': 1024}} filter_properties = {'instance_type': {'memory_mb': 1024}}
host = fakes.FakeHostState('host1', 'node1', host = fakes.FakeHostState('host1', 'node1',
{'free_ram_mb': 1023, 'total_usable_ram_mb': 1024}) {'free_ram_mb': 1023, 'total_usable_ram_mb': 1024})
self.assertFalse(self.filt_cls.host_passes(host, filter_properties)) self.assertFalse(self.filt_cls.host_passes(host, filter_properties))
def test_ram_filter_passes(self): def test_ram_filter_passes(self):
ram_filter.RamFilter.ram_allocation_ratio = 1.0 self.flags(ram_allocation_ratio=1.0)
filter_properties = {'instance_type': {'memory_mb': 1024}} filter_properties = {'instance_type': {'memory_mb': 1024}}
host = fakes.FakeHostState('host1', 'node1', host = fakes.FakeHostState('host1', 'node1',
{'free_ram_mb': 1024, 'total_usable_ram_mb': 1024}) {'free_ram_mb': 1024, 'total_usable_ram_mb': 1024})
self.assertTrue(self.filt_cls.host_passes(host, filter_properties)) self.assertTrue(self.filt_cls.host_passes(host, filter_properties))
def test_ram_filter_oversubscribe(self): def test_ram_filter_oversubscribe(self):
ram_filter.RamFilter.ram_allocation_ratio = 2.0 self.flags(ram_allocation_ratio=2.0)
filter_properties = {'instance_type': {'memory_mb': 1024}} filter_properties = {'instance_type': {'memory_mb': 1024}}
host = fakes.FakeHostState('host1', 'node1', host = fakes.FakeHostState('host1', 'node1',
{'free_ram_mb': -1024, 'total_usable_ram_mb': 2048}) {'free_ram_mb': -1024, 'total_usable_ram_mb': 2048})