← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/scheduler/filters/json_filter.py
14
14
#    under the License.
15
15
 
16
16
 
17
 
import json
18
17
import operator
19
18
 
 
19
from nova.openstack.common import jsonutils
20
20
from nova.scheduler import filters
21
21
 
22
22
 
138
138
        # NOTE(comstud): Not checking capabilities or service for
139
139
        # enabled/disabled so that a provided json filter can decide
140
140
 
141
 
        result = self._process_filter(json.loads(query), host_state)
 
141
        result = self._process_filter(jsonutils.loads(query), host_state)
142
142
        if isinstance(result, list):
143
143
            # If any succeeded, include the host
144
144
            result = any(result)