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
45 lines
1.3 KiB
Python
45 lines
1.3 KiB
Python
# Copyright (c) 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.
|
|
|
|
"""
|
|
Scheduler host weighers
|
|
"""
|
|
|
|
from manila.scheduler.weighers import base
|
|
|
|
|
|
class WeighedHost(base.WeighedObject):
|
|
def to_dict(self):
|
|
return {
|
|
'weight': self.weight,
|
|
'host': self.obj.host,
|
|
}
|
|
|
|
def __repr__(self):
|
|
return ("WeighedHost [host: %s, weight: %s]" %
|
|
(self.obj.host, self.weight))
|
|
|
|
|
|
class BaseHostWeigher(base.BaseWeigher):
|
|
"""Base class for host weighers."""
|
|
pass
|
|
|
|
|
|
class HostWeightHandler(base.BaseWeightHandler):
|
|
object_class = WeighedHost
|
|
|
|
def __init__(self, namespace):
|
|
super(HostWeightHandler, self).__init__(BaseHostWeigher, namespace)
|