Merge "Cells: Add support for global cinder"

1 files changed, 6 insertions, 3 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index c44f62206..b6fc19af0 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3123,15 +3123,16 @@ def block_device_mapping_create(context, values, legacy=True):
     bdm_ref = models.BlockDeviceMapping()
     bdm_ref.update(values)
     bdm_ref.save()
+    return bdm_ref
 
 
 @require_context
 def block_device_mapping_update(context, bdm_id, values, legacy=True):
     _scrub_empty_str_values(values, ['volume_size'])
     values = _from_legacy_values(values, legacy, allow_updates=True)
-    _block_device_mapping_get_query(context).\
-            filter_by(id=bdm_id).\
-            update(values)
+    query = _block_device_mapping_get_query(context).filter_by(id=bdm_id)
+    query.update(values)
+    return query.first()
 
 
 def block_device_mapping_update_or_create(context, values, legacy=True):
@@ -3147,6 +3148,7 @@ def block_device_mapping_update_or_create(context, values, legacy=True):
             bdm_ref = models.BlockDeviceMapping()
             bdm_ref.update(values)
             bdm_ref.save(session=session)
+            result = bdm_ref
         else:
             values = _from_legacy_values(values, legacy, allow_updates=True)
             result.update(values)
@@ -3169,6 +3171,7 @@ def block_device_mapping_update_or_create(context, values, legacy=True):
                     models.BlockDeviceMapping.guest_format == None,
                     models.BlockDeviceMapping.guest_format != 'swap')).
                  soft_delete())
+        return result
 
 
 @require_context