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
54 lines
2.0 KiB
Python
54 lines
2.0 KiB
Python
# Copyright 2011 OpenStack Foundation.
|
|
# 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 IgnoreAttemptedHost filter.
|
|
"""
|
|
|
|
from oslo_context import context
|
|
|
|
from manila.scheduler.filters import ignore_attempted_hosts
|
|
from manila import test
|
|
from manila.tests.scheduler import fakes
|
|
|
|
|
|
class HostFiltersTestCase(test.TestCase):
|
|
"""Test case for IgnoreAttemptedHost filter."""
|
|
|
|
def setUp(self):
|
|
super(HostFiltersTestCase, self).setUp()
|
|
self.context = context.RequestContext('fake', 'fake')
|
|
self.filter = ignore_attempted_hosts.IgnoreAttemptedHostsFilter()
|
|
|
|
def test_ignore_attempted_hosts_filter_disabled(self):
|
|
# Test case where re-scheduling is disabled.
|
|
host = fakes.FakeHostState('host1', {})
|
|
filter_properties = {}
|
|
self.assertTrue(self.filter.host_passes(host, filter_properties))
|
|
|
|
def test_ignore_attempted_hosts_filter_pass(self):
|
|
# Node not previously tried.
|
|
host = fakes.FakeHostState('host1', {})
|
|
attempted = dict(num_attempts=2, hosts=['host2'])
|
|
filter_properties = dict(retry=attempted)
|
|
self.assertTrue(self.filter.host_passes(host, filter_properties))
|
|
|
|
def test_ignore_attempted_hosts_filter_fail(self):
|
|
# Node was already tried.
|
|
host = fakes.FakeHostState('host1', {})
|
|
attempted = dict(num_attempts=2, hosts=['host1'])
|
|
filter_properties = dict(retry=attempted)
|
|
self.assertFalse(self.filter.host_passes(host, filter_properties))
|