Remove use of autocommit

Change-Id: I6e973935edf5e754ba054e724b6963b6d5fd795a

Author: mnasiadka

magnum/db/sqlalchemy/api.py

@@ -47,9 +47,7 @@
 def _create_facade_lazily():
     global _FACADE
     if _FACADE is None:
-        # FIXME(karolinku): autocommit=True it's not compatible with
-        # SQLAlchemy 2.0, and will be removed in future
-        _FACADE = db_session.EngineFacade.from_config(CONF, autocommit=True)
+        _FACADE = db_session.EngineFacade.from_config(CONF)
         if profiler_sqlalchemy:
             if CONF.profiler.enabled and CONF.profiler.trace_sqlalchemy:
                 profiler_sqlalchemy.add_tracing(sa, _FACADE.get_engine(), "db")

magnum/db/sqlalchemy/models.py

@@ -93,7 +93,8 @@ def save(self, session=None):
         if session is None:
             session = db_api.get_session()
 
-        super(MagnumBase, self).save(session)
+        with session.begin():
+            super(MagnumBase, self).save(session)
 
 
 Base = declarative_base(cls=MagnumBase)