← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/scheduler/filters/__init__.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/scheduler/filters/__init__.py
21
21
import types
22
22
 
23
23
from nova import exception
24
 
from nova import utils
 
24
from nova.openstack.common import importutils
25
25
 
26
26
 
27
27
class BaseHostFilter(object):
43
43
def _get_filter_classes_from_module(module_name):
44
44
    """Get all filter classes from a module."""
45
45
    classes = []
46
 
    module = utils.import_object(module_name)
 
46
    module = importutils.import_module(module_name)
47
47
    for obj_name in dir(module):
48
48
        itm = getattr(module, obj_name)
49
49
        if _is_filter_class(itm):
75
75
    """Get filter classes from class names."""
76
76
    classes = []
77
77
    for cls_name in filter_class_names:
78
 
        obj = utils.import_class(cls_name)
 
78
        obj = importutils.import_class(cls_name)
79
79
        if _is_filter_class(obj):
80
80
            classes.append(obj)
81
81
        elif type(obj) is types.FunctionType: