7c615c9f49
This branch adds the ability to define a local JSON file that will hold configuration information that the scheduler can use. This dict will be passed into the filter and weighing functions so that Operations can tweak the scheduler without having to bring down the scheduler service. Currently the polling time on the file is hardcoded at 5 minutes, but certainly this could be made into a flag. Next update will be to remove the host_filter and weighing_functions flags and fix the scheduler to get these values from the config file. Change-Id: Ia2487e933483761276058689fad84564d96a451e
139 lines
5.1 KiB
Python
139 lines
5.1 KiB
Python
# Copyright 2011 OpenStack LLC.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
"""
|
|
Tests For PickledScheduler.
|
|
"""
|
|
|
|
import datetime
|
|
import json
|
|
import StringIO
|
|
|
|
from nova.scheduler import scheduler_options
|
|
from nova import test
|
|
|
|
|
|
class FakeSchedulerOptions(scheduler_options.SchedulerOptions):
|
|
def __init__(self, last_checked, now, file_old, file_now, data, filedata):
|
|
super(FakeSchedulerOptions, self).__init__()
|
|
# Change internals ...
|
|
self.last_modified = file_old
|
|
self.last_checked = last_checked
|
|
self.data = data
|
|
|
|
# For overrides ...
|
|
self._time_now = now
|
|
self._file_now = file_now
|
|
self._file_data = filedata
|
|
|
|
self.file_was_loaded = False
|
|
|
|
def _get_file_timestamp(self, filename):
|
|
return self._file_now
|
|
|
|
def _get_file_handle(self, filename):
|
|
self.file_was_loaded = True
|
|
return StringIO.StringIO(self._file_data)
|
|
|
|
def _get_time_now(self):
|
|
return self._time_now
|
|
|
|
|
|
class SchedulerOptionsTestCase(test.TestCase):
|
|
def test_get_configuration_first_time_no_flag(self):
|
|
last_checked = None
|
|
now = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
file_old = None
|
|
file_now = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
|
|
data = dict(a=1, b=2, c=3)
|
|
jdata = json.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
{}, jdata)
|
|
self.assertEquals({}, fake.get_configuration())
|
|
self.assertFalse(fake.file_was_loaded)
|
|
|
|
def test_get_configuration_first_time_empty_file(self):
|
|
last_checked = None
|
|
now = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
file_old = None
|
|
file_now = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
|
|
data = dict(a=1, b=2, c=3)
|
|
jdata = ""
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
{}, jdata)
|
|
self.assertEquals({}, fake.get_configuration('foo.json'))
|
|
self.assertTrue(fake.file_was_loaded)
|
|
|
|
def test_get_configuration_first_time_happy_day(self):
|
|
last_checked = None
|
|
now = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
file_old = None
|
|
file_now = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
|
|
data = dict(a=1, b=2, c=3)
|
|
jdata = json.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
{}, jdata)
|
|
self.assertEquals(data, fake.get_configuration('foo.json'))
|
|
self.assertTrue(fake.file_was_loaded)
|
|
|
|
def test_get_configuration_second_time_no_change(self):
|
|
last_checked = datetime.datetime(2011, 1, 1, 1, 1, 1)
|
|
now = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
file_old = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
file_now = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
|
|
data = dict(a=1, b=2, c=3)
|
|
jdata = json.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
data, jdata)
|
|
self.assertEquals(data, fake.get_configuration('foo.json'))
|
|
self.assertFalse(fake.file_was_loaded)
|
|
|
|
def test_get_configuration_second_time_too_fast(self):
|
|
last_checked = datetime.datetime(2011, 1, 1, 1, 1, 1)
|
|
now = datetime.datetime(2011, 1, 1, 1, 1, 2)
|
|
file_old = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
file_now = datetime.datetime(2013, 1, 1, 1, 1, 1)
|
|
|
|
old_data = dict(a=1, b=2, c=3)
|
|
data = dict(a=11, b=12, c=13)
|
|
jdata = json.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
old_data, jdata)
|
|
self.assertEquals(old_data, fake.get_configuration('foo.json'))
|
|
self.assertFalse(fake.file_was_loaded)
|
|
|
|
def test_get_configuration_second_time_change(self):
|
|
last_checked = datetime.datetime(2011, 1, 1, 1, 1, 1)
|
|
now = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
file_old = datetime.datetime(2012, 1, 1, 1, 1, 1)
|
|
file_now = datetime.datetime(2013, 1, 1, 1, 1, 1)
|
|
|
|
old_data = dict(a=1, b=2, c=3)
|
|
data = dict(a=11, b=12, c=13)
|
|
jdata = json.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
old_data, jdata)
|
|
self.assertEquals(data, fake.get_configuration('foo.json'))
|
|
self.assertTrue(fake.file_was_loaded)
|