diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-05-13 20:39:44 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-05-13 20:39:44 +0000 |
commit | 65382d8c736652b118d05e8771c42d060bd9adcf (patch) | |
tree | af9c4c79b977b3ef69cc6582374fd6aafd6e531b /openstack | |
parent | 44c79fc027cf540ab37a316d3c9f239fa74d31dc (diff) | |
parent | 1f2aba5f706f882663e770bc8dac031627c91f39 (diff) | |
download | oslo-65382d8c736652b118d05e8771c42d060bd9adcf.tar.gz oslo-65382d8c736652b118d05e8771c42d060bd9adcf.tar.xz oslo-65382d8c736652b118d05e8771c42d060bd9adcf.zip |
Merge "Renames filter to base_filter and weight to base_weight"
Diffstat (limited to 'openstack')
-rw-r--r-- | openstack/common/scheduler/base_filter.py (renamed from openstack/common/scheduler/filter.py) | 0 | ||||
-rw-r--r-- | openstack/common/scheduler/base_weight.py (renamed from openstack/common/scheduler/weight.py) | 0 | ||||
-rw-r--r-- | openstack/common/scheduler/filters/__init__.py | 6 | ||||
-rw-r--r-- | openstack/common/scheduler/weights/__init__.py | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/openstack/common/scheduler/filter.py b/openstack/common/scheduler/base_filter.py index 52c18af..52c18af 100644 --- a/openstack/common/scheduler/filter.py +++ b/openstack/common/scheduler/base_filter.py diff --git a/openstack/common/scheduler/weight.py b/openstack/common/scheduler/base_weight.py index 82f1d25..82f1d25 100644 --- a/openstack/common/scheduler/weight.py +++ b/openstack/common/scheduler/base_weight.py diff --git a/openstack/common/scheduler/filters/__init__.py b/openstack/common/scheduler/filters/__init__.py index d3a99a5..6fb5a13 100644 --- a/openstack/common/scheduler/filters/__init__.py +++ b/openstack/common/scheduler/filters/__init__.py @@ -18,12 +18,12 @@ Scheduler host filters """ from openstack.common import log as logging -from openstack.common.scheduler import filter +from openstack.common.scheduler import base_filter LOG = logging.getLogger(__name__) -class BaseHostFilter(filter.BaseFilter): +class BaseHostFilter(base_filter.BaseFilter): """Base class for host filters.""" def _filter_one(self, obj, filter_properties): """Return True if the object passes the filter, otherwise False.""" @@ -36,6 +36,6 @@ class BaseHostFilter(filter.BaseFilter): raise NotImplementedError() -class HostFilterHandler(filter.BaseFilterHandler): +class HostFilterHandler(base_filter.BaseFilterHandler): def __init__(self, namespace): super(HostFilterHandler, self).__init__(BaseHostFilter, namespace) diff --git a/openstack/common/scheduler/weights/__init__.py b/openstack/common/scheduler/weights/__init__.py index c05c04e..e2eb04a 100644 --- a/openstack/common/scheduler/weights/__init__.py +++ b/openstack/common/scheduler/weights/__init__.py @@ -18,10 +18,10 @@ Scheduler host weights """ -from openstack.common.scheduler import weight +from openstack.common.scheduler import base_weight -class WeighedHost(weight.WeighedObject): +class WeighedHost(base_weight.WeighedObject): def to_dict(self): return { 'weight': self.weight, @@ -33,12 +33,12 @@ class WeighedHost(weight.WeighedObject): (self.obj.host, self.weight)) -class BaseHostWeigher(weight.BaseWeigher): +class BaseHostWeigher(base_weight.BaseWeigher): """Base class for host weights.""" pass -class HostWeightHandler(weight.BaseWeightHandler): +class HostWeightHandler(base_weight.BaseWeightHandler): object_class = WeighedHost def __init__(self, namespace): |