Merge "flatten distributed scheduler"

2 files changed, 15 insertions, 0 deletions

diff --git a/nova/db/api.py b/nova/db/api.py
index c5d47281d..7af81a1a2 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -158,6 +158,11 @@ def compute_node_get(context, compute_id, session=None):
     return IMPL.compute_node_get(context, compute_id)
 
 
+def compute_node_get_all(context, session=None):
+    """Get all computeNodes."""
+    return IMPL.compute_node_get_all(context)
+
+
 def compute_node_create(context, values):
     """Create a computeNode from the values dictionary."""
     return IMPL.compute_node_create(context, values)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index eb3d6105c..4cd9c2eb1 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -367,6 +367,16 @@ def compute_node_get(context, compute_id, session=None):
 
 
 @require_admin_context
+def compute_node_get_all(context, session=None):
+    if not session:
+        session = get_session()
+
+    return session.query(models.ComputeNode).\
+                    options(joinedload('service')).\
+                    filter_by(deleted=can_read_deleted(context))
+
+
+@require_admin_context
 def compute_node_create(context, values):
     compute_node_ref = models.ComputeNode()
     compute_node_ref.update(values)