Remove use of Session.begin.subtransactions flag

Resolve the following RemovedIn20Warning warning:

  The Session.begin.subtransactions flag is deprecated and will be
  removed in SQLAlchemy version 2.0.  See the documentation at
  session_subtransactions for background on a compatible alternative
  pattern.

Change-Id: Ib2537bae77861ee60d17a48a72c57b88e043553e
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

1 files changed, 2 insertions, 12 deletions

diff --git a/oslo_db/sqlalchemy/models.py b/oslo_db/sqlalchemy/models.py
index 2bad0f5..72ac7cb 100644
--- a/oslo_db/sqlalchemy/models.py
+++ b/oslo_db/sqlalchemy/models.py
@@ -34,18 +34,8 @@ class ModelBase(object):
 
     def save(self, session):
         """Save this object."""
-
-        # NOTE(boris-42): This part of code should be look like:
-        #                       session.add(self)
-        #                       session.flush()
-        #                 But there is a bug in sqlalchemy and eventlet that
-        #                 raises NoneType exception if there is no running
-        #                 transaction and rollback is called. As long as
-        #                 sqlalchemy has this bug we have to create transaction
-        #                 explicitly.
-        with session.begin(subtransactions=True):
-            session.add(self)
-            session.flush()
+        session.add(self)
+        session.flush()
 
     def __setitem__(self, key, value):
         setattr(self, key, value)