From b4dbc4efa576af61ddc26d1c277237ad4bcdfcfa Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 27 Sep 2010 12:07:55 +0200
Subject: Add db api methods for retrieving the networks for which a host is
 the designated network host.

---
 nova/db/api.py            | 12 ++++++++++++
 nova/db/sqlalchemy/api.py | 12 ++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'nova/db')

diff --git a/nova/db/api.py b/nova/db/api.py
index c1cb1953a..4657408db 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -554,3 +554,15 @@ def volume_update(context, volume_id, values):
 
     """
     return IMPL.volume_update(context, volume_id, values)
+
+
+###################
+
+
+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 2b0dd6ea6..6e6b0e3fc 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -848,3 +848,15 @@ def volume_update(_context, volume_id, values):
         for (key, value) in values.iteritems():
             volume_ref[key] = value
         volume_ref.save(session=session)
+
+
+###################
+
+
+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()
-- 
cgit 


From 5945291281f239bd928cea1833ee5a5b6c3df523 Mon Sep 17 00:00:00 2001
From: Ewan Mellor <emellor@silver>
Date: Sat, 2 Oct 2010 12:42:09 +0100
Subject: Bug #653534: NameError on session_get in
 sqlalchemy.api.service_update

Fix function call: session_get was meant to be service_get.
---
 nova/db/sqlalchemy/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 7f72f66b9..9a7c71a70 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)
-- 
cgit