From a8b1148a5424cc29269009460941386a68f2366f Mon Sep 17 00:00:00 2001
From: Renuka Apte <renuka.apte@citrix.com>
Date: Wed, 11 Jan 2012 17:10:24 -0800
Subject: sm vol driver: Fix regression in sm_backend_conf_update

Fixes bug 915108

Change-Id: Iffa9a1a51f6e9da0cba9fdae373135ea6a70990f
---
 nova/db/sqlalchemy/api.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 0ba1764ac..02ce8b963 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -4152,17 +4152,20 @@ def sm_backend_conf_create(context, values):
 
 @require_admin_context
 def sm_backend_conf_update(context, sm_backend_id, values):
-    backend_conf = model_query(context, models.SMBackendConf,
-                               read_deleted="yes").\
+    session = get_session()
+    with session.begin():
+        backend_conf = model_query(context, models.SMBackendConf,
+                                   session=session,
+                                   read_deleted="yes").\
                            filter_by(id=sm_backend_id).\
                            first()
 
-    if not backend_conf:
-        raise exception.NotFound(
+        if not backend_conf:
+            raise exception.NotFound(
                 _("No backend config with id %(sm_backend_id)s") % locals())
 
-    backend_conf.update(values)
-    backend_conf.save()
+        backend_conf.update(values)
+        backend_conf.save(session=session)
     return backend_conf
 
 
-- 
cgit