af2e103514
With oslo-incubator going away, we need to pull those classes into the Manila code base, along with their unit tests. This presents a good opportunity to do some long-needed housecleaning. This commit does the following: 1. Moves the scheduler classes from openstack.common to manila. 2. Adds the unit tests from olso-incubator into Manila. 3. Removes duplication among the combined scheduler modules. 4. Moves scheduler drivers into a sub-module. 5. Normalizes class and module naming throughout the scheduler. 6. Splits some unit test files so they match the names of the modules that they test. 7. Converts usage of mox & oslotest to mock & unittest. 8. Adds a few unit tests to boost coverage levels. Implements: blueprint reorganize-manila-scheduler Change-Id: I7aa237e17787e89a95bb198093ea9bc9498279cd
144 lines
5.1 KiB
Python
144 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 scheduler options.
|
|
"""
|
|
|
|
import datetime
|
|
|
|
from oslo_serialization import jsonutils
|
|
import six
|
|
|
|
from manila.scheduler import scheduler_options
|
|
from manila 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 = six.b(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
|
|
if six.PY2:
|
|
import StringIO
|
|
return StringIO.StringIO(self._file_data)
|
|
else:
|
|
import io
|
|
return io.BytesIO(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 = jsonutils.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
{}, jdata)
|
|
self.assertEqual({}, 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)
|
|
|
|
jdata = ""
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
{}, jdata)
|
|
self.assertEqual({}, 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 = jsonutils.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
{}, jdata)
|
|
self.assertEqual(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 = jsonutils.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
data, jdata)
|
|
self.assertEqual(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 = jsonutils.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
old_data, jdata)
|
|
self.assertEqual(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 = jsonutils.dumps(data)
|
|
|
|
fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
|
|
old_data, jdata)
|
|
self.assertEqual(data, fake.get_configuration('foo.json'))
|
|
self.assertTrue(fake.file_was_loaded)
|