Merge "Get rid of get_engine() in db/api.py"
This commit is contained in:
commit
597a27cb35
@ -16,6 +16,7 @@
|
|||||||
import contextlib
|
import contextlib
|
||||||
|
|
||||||
from debtcollector import moves
|
from debtcollector import moves
|
||||||
|
from debtcollector import removals
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_db import api as oslo_db_api
|
from oslo_db import api as oslo_db_api
|
||||||
from oslo_db import exception as db_exc
|
from oslo_db import exception as db_exc
|
||||||
@ -115,8 +116,7 @@ def exc_to_retry(exceptions):
|
|||||||
raise db_exc.RetryRequest(e)
|
raise db_exc.RetryRequest(e)
|
||||||
|
|
||||||
|
|
||||||
#TODO(akamyshnikova): when all places in the code, which use sessions/
|
@removals.remove(version='Newton', removal_version='Ocata')
|
||||||
# connections will be updated, this won't be needed
|
|
||||||
def get_engine():
|
def get_engine():
|
||||||
"""Helper method to grab engine."""
|
"""Helper method to grab engine."""
|
||||||
return context_manager.get_legacy_facade().get_engine()
|
return context_manager.get_legacy_facade().get_engine()
|
||||||
|
@ -6427,7 +6427,7 @@ class DbOperationBoundMixin(object):
|
|||||||
def _event_incrementer(*args, **kwargs):
|
def _event_incrementer(*args, **kwargs):
|
||||||
self._db_execute_count += 1
|
self._db_execute_count += 1
|
||||||
|
|
||||||
engine = db_api.get_engine()
|
engine = db_api.context_manager.get_legacy_facade().get_engine()
|
||||||
event.listen(engine, 'after_execute', _event_incrementer)
|
event.listen(engine, 'after_execute', _event_incrementer)
|
||||||
self.addCleanup(event.remove, engine, 'after_execute',
|
self.addCleanup(event.remove, engine, 'after_execute',
|
||||||
_event_incrementer)
|
_event_incrementer)
|
||||||
|
@ -461,7 +461,7 @@ class FlavorPluginTestCase(test_db_base_plugin_v2.NeutronDbPluginV2TestCase,
|
|||||||
self.service_manager.add_provider_configuration(
|
self.service_manager.add_provider_configuration(
|
||||||
provider.split(':')[0], provconf.ProviderConfiguration())
|
provider.split(':')[0], provconf.ProviderConfiguration())
|
||||||
|
|
||||||
dbapi.get_engine()
|
dbapi.context_manager.get_legacy_facade().get_engine()
|
||||||
|
|
||||||
def _create_flavor(self, description=None):
|
def _create_flavor(self, description=None):
|
||||||
flavor = {'flavor': {'name': 'GOLD',
|
flavor = {'flavor': {'name': 'GOLD',
|
||||||
|
@ -1072,7 +1072,7 @@ class TestMl2PortsV2(test_plugin.TestPortsV2, Ml2PluginV2TestCase):
|
|||||||
raise db_exc.DBDuplicateEntry()
|
raise db_exc.DBDuplicateEntry()
|
||||||
|
|
||||||
listener = IPAllocationsGrenade()
|
listener = IPAllocationsGrenade()
|
||||||
engine = db_api.get_engine()
|
engine = db_api.context_manager.get_legacy_facade().get_engine()
|
||||||
event.listen(engine, 'before_cursor_execute', listener.execute)
|
event.listen(engine, 'before_cursor_execute', listener.execute)
|
||||||
event.listen(engine, 'commit', listener.commit)
|
event.listen(engine, 'commit', listener.commit)
|
||||||
self.addCleanup(event.remove, engine, 'before_cursor_execute',
|
self.addCleanup(event.remove, engine, 'before_cursor_execute',
|
||||||
|
@ -26,7 +26,6 @@ import webob
|
|||||||
import webob.exc
|
import webob.exc
|
||||||
|
|
||||||
from neutron.common import exceptions as n_exc
|
from neutron.common import exceptions as n_exc
|
||||||
from neutron.db import api
|
|
||||||
from neutron.tests import base
|
from neutron.tests import base
|
||||||
from neutron.tests.common import helpers
|
from neutron.tests.common import helpers
|
||||||
from neutron import wsgi
|
from neutron import wsgi
|
||||||
@ -67,10 +66,8 @@ class TestServiceBase(base.BaseTestCase):
|
|||||||
class TestWorkerService(TestServiceBase):
|
class TestWorkerService(TestServiceBase):
|
||||||
"""WorkerService tests."""
|
"""WorkerService tests."""
|
||||||
|
|
||||||
@mock.patch('neutron.db.api.get_engine')
|
@mock.patch('neutron.db.api.context_manager.get_legacy_facade')
|
||||||
def test_start_withoutdb_call(self, apimock):
|
def test_start_withoutdb_call(self, apimock):
|
||||||
# clear engine from other tests
|
|
||||||
api._FACADE = None
|
|
||||||
_service = mock.Mock()
|
_service = mock.Mock()
|
||||||
_service.pool.spawn.return_value = None
|
_service.pool.spawn.return_value = None
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user