openstack/zun
Code Issues Proposed changes

Merge "Use global variable to define etcd driver instance"

Browse Source
This commit is contained in:
Zuul 2017-12-04 03:30:41 +00:00 committed by Gerrit Code Review
commit b254fc2737
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zun/db/api.py
View File

@ -29,6 +29,7 @@ _BACKEND_MAPPING = {'sqlalchemy': 'zun.db.sqlalchemy.api'}
IMPL = db_api.DBAPI.from_config(CONF,
backend_mapping=_BACKEND_MAPPING,
lazy=True)
_etcd_instance = None
@profiler.trace("db")
@ -37,8 +38,11 @@ def _get_dbdriver_instance():
if CONF.db_type == 'sql':
return IMPL
elif CONF.db_type == 'etcd':
import zun.db.etcd.api as etcd_api
return etcd_api.get_connection()
global _etcd_instance
if _etcd_instance is None:
import zun.db.etcd.api as etcd_api
_etcd_instance = etcd_api.get_connection()
return _etcd_instance
else:
raise exception.ConfigInvalid(
_("db_type value of %s is invalid, "

4
zun/tests/unit/db/test_zun_service.py
View File

@ -29,6 +29,10 @@ from zun.tests.unit.db.utils import FakeEtcdResult
class DbZunServiceTestCase(base.DbTestCase):
def setUp(self):
cfg.CONF.set_override('db_type', 'sql')
super(DbZunServiceTestCase, self).setUp()
def test_create_zun_service(self):
utils.create_test_zun_service()