openstack
/
monasca-api
Code Issues Proposed changes

fixed idle sql sessions at startup 

Change-Id: I4c3bd9047684adb2b7e455754240ae7e475071cb
Story: 2001264
Task: 5798
This commit is contained in:
Amir Mofakhar 2017-11-02 15:00:04 +01:00
parent b1c3fbc3da
commit 9ed87db4b4
7 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -1,4 +1,5 @@
Adrian Czarnecki <adrian.czarnecki@ts.fujitsu.com>
Amir Mofakhar <amofakhar@op5.com>
Andrea Adams <aadams@hpe.com>
Andreas Jaeger <aj@suse.com>
Angelo Mendonca <angelomendonca@gmail.com>

4
monasca_api/common/repositories/sqla/sql_repository.py
View File

@ -72,7 +72,9 @@ class SQLRepository(object):
try:
super(SQLRepository, self).__init__()
self.conf = CONF
self._db_engine = get_engine()
if not hasattr(self.conf, 'sql_engine'):
self.conf.sql_engine = get_engine()
self._db_engine = self.conf.sql_engine
self.metadata = sqlalchemy.MetaData()
except Exception as ex:

2
monasca_api/tests/test_a_repository.py
View File

@ -167,6 +167,8 @@ class TestAlarmRepoDB(base.BaseTestCase):
@classmethod
def tearDownClass(cls):
cls.fixture.cleanUp()
if hasattr(CONF, 'sql_engine'):
delattr(CONF, 'sql_engine')
def setUp(self):
super(TestAlarmRepoDB, self).setUp()

2
monasca_api/tests/test_ad_repository.py
View File

@ -120,6 +120,8 @@ class TestAlarmDefinitionRepoDB(base.BaseTestCase):
@classmethod
def tearDownClass(cls):
cls.fixture.cleanUp()
if hasattr(CONF, 'sql_engine'):
delattr(CONF, 'sql_engine')
def setUp(self):
super(TestAlarmDefinitionRepoDB, self).setUp()

5
monasca_api/tests/test_alarms_db_health_check.py
View File

@ -32,6 +32,11 @@ class TestMetricsDbHealthCheckLogic(base.BaseTestCase):
super(TestMetricsDbHealthCheckLogic, self).setUp()
self.conf_default(group='database', **self.mocked_config)
@classmethod
def tearDownClass(cls):
if hasattr(CONF, 'sql_engine'):
delattr(CONF, 'sql_engine')
@mock.patch('monasca_api.healthcheck.alarms_db_check.'
'sql_repository.get_engine')
def test_should_pass_db_ok(self, _):

5
monasca_api/tests/test_healthchecks.py
View File

@ -27,6 +27,11 @@ ENDPOINT = '/healthcheck'
class TestHealthChecks(test_base.BaseApiTestCase):
@classmethod
def tearDownClass(cls):
if hasattr(CONF, 'sql_engine'):
delattr(CONF, 'sql_engine')
def set_route(self):
self.resources = healthchecks.HealthChecks()
self.api.add_route(

2
monasca_api/tests/test_nm_repository.py
View File

@ -64,6 +64,8 @@ class TestNotificationMethodRepoDB(base.BaseTestCase):
@classmethod
def tearDownClass(cls):
cls.fixture.cleanUp()
if hasattr(CONF, 'sql_engine'):
delattr(CONF, 'sql_engine')
def setUp(self):
super(TestNotificationMethodRepoDB, self).setUp()