From e8626ced188dbfc4d33a5d0bd74dfcd4ed18c4f4 Mon Sep 17 00:00:00 2001
From: Dina Belova <dbelova@mirantis.com>
Date: Mon, 23 Apr 2012 16:37:06 +0400
Subject: Improvement for the correct query extraction.

Change-Id: I6bf318dc42e9bc1cebb94a7d1c561b3e89ae6ec5
---
 nova/scheduler/filters/json_filter.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'nova/scheduler')

diff --git a/nova/scheduler/filters/json_filter.py b/nova/scheduler/filters/json_filter.py
index 19c80b019..c0aa49b89 100644
--- a/nova/scheduler/filters/json_filter.py
+++ b/nova/scheduler/filters/json_filter.py
@@ -128,7 +128,10 @@ class JsonFilter(filters.BaseHostFilter):
         """Return a list of hosts that can fulfill the requirements
         specified in the query.
         """
-        query = filter_properties.get('query', None)
+        try:
+            query = filter_properties['scheduler_hints']['query']
+        except KeyError:
+            query = None
         if not query:
             return True
 
-- 
cgit