Merge trunk. Again.

2 files changed, 21 insertions, 1 deletions

diff --git a/nova/db/api.py b/nova/db/api.py
index d92747dce..a6d1f405a 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -673,3 +673,14 @@ def project_update(context, project_id, values):
 def project_delete(context, project_id):
     """Delete project"""
     return IMPL.project_delete(context, project_id)
+
+
+###################
+
+
+def host_get_networks(context, host):
+    """Return all networks for which the given host is the designated
+    network host
+    """
+    return IMPL.host_get_networks(context, host)
+
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 49d015716..e0c6a34b8 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -240,7 +240,7 @@ def service_create(context, values):
 def service_update(context, service_id, values):
     session = get_session()
     with session.begin():
-        service_ref = session_get(context, service_id, session=session)
+        service_ref = service_get(context, service_id, session=session)
         for (key, value) in values.iteritems():
             service_ref[key] = value
         service_ref.save(session=session)
@@ -1485,3 +1485,12 @@ def user_add_project_role(context, user_id, project_id, role):
 
 
 ###################
+
+
+def host_get_networks(context, host):
+    session = get_session()
+    with session.begin():
+        return session.query(models.Network
+                     ).filter_by(deleted=False
+                     ).filter_by(host=host
+                     ).all()