openstack
/
nova
Code Issues Proposed changes

Merge "Resource limits check sometimes enforced for forced scheduling"

This commit is contained in:
Jenkins 2013-10-04 17:56:56 +00:00 committed by Gerrit Code Review
parent d2c5ecf266 d24df3bb71
commit 5fec8df325
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/scheduler/utils.py
View File

@ -113,7 +113,8 @@ def populate_filter_properties(filter_properties, host_state):
_add_retry_host(filter_properties, host, nodename)
# Adds oversubscription policy
filter_properties['limits'] = limits
if not filter_properties.get('force_hosts'):
filter_properties['limits'] = limits
def _add_retry_host(filter_properties, host, node):

8
nova/tests/scheduler/test_scheduler_utils.py
View File

@ -145,7 +145,13 @@ class SchedulerUtilsTestCase(test.NoDBTestCase):
scheduler_utils.populate_filter_properties(filter_properties,
host_state)
self.assertEqual('fake-limits', filter_properties['limits'])
if force_hosts:
expected_limits = None
else:
expected_limits = 'fake-limits'
self.assertEqual(expected_limits,
filter_properties.get('limits'))
if with_retry and not force_hosts and not force_nodes:
self.assertEqual([['fake-host', 'fake-node'],
['fake-host', 'fake-node']],