DB_Controller: refactor rz_config dep -> rz_config.rest_api_base_url

6 files changed, 7 insertions, 8 deletions

diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py
index 19c08f77..9c47e6bc 100644
--- a/src/server-tests/test_db_controller.py
+++ b/src/server-tests/test_db_controller.py
@@ -47,7 +47,7 @@ class TestDBController(unittest.TestCase):
     @classmethod
     def setUpClass(self):
         cfg = Config.init_from_file('res/etc/rhizi-server.conf')
-        self.db_ctl = dbc.DB_Controller(cfg)
+        self.db_ctl = dbc.DB_Controller(cfg.db_base_url)
         self.log = logging.getLogger('rhizi')
         self.log.addHandler(logging.StreamHandler())
 
diff --git a/src/server-tests/test_rhizi_api.py b/src/server-tests/test_rhizi_api.py
index a010522b..4665205b 100644
--- a/src/server-tests/test_rhizi_api.py
+++ b/src/server-tests/test_rhizi_api.py
@@ -21,7 +21,7 @@ class TestRhiziAPI(unittest.TestCase):
     @classmethod
     def setUpClass(self):
         cfg = Config.init_from_file('res/etc/rhizi-server.conf')
-        self.db_ctl = dbc.DB_Controller(cfg)
+        self.db_ctl = dbc.DB_Controller(cfg.db_base_url)
         rz_api.db_ctl = self.db_ctl
 
         # TODO extract to superclass
diff --git a/src/server-tests/test_rzdoc.py b/src/server-tests/test_rzdoc.py
index 01e15400..9235beae 100644
--- a/src/server-tests/test_rzdoc.py
+++ b/src/server-tests/test_rzdoc.py
@@ -13,7 +13,7 @@ class TestRZDoc(unittest.TestCase):
     @classmethod
     def setUpClass(self):
         cfg = Config.init_from_file('res/etc/rhizi-server.conf')
-        self.db_ctl = db_controller.DB_Controller(cfg)
+        self.db_ctl = db_controller.DB_Controller(cfg.db_base_url)
         self.log = logging.getLogger('rhizi')
         self.log.addHandler(logging.StreamHandler())
         self.kernel = RZ_Kernel()
diff --git a/src/server-tests/test_util.py b/src/server-tests/test_util.py
index 8129b566..4484ec2f 100644
--- a/src/server-tests/test_util.py
+++ b/src/server-tests/test_util.py
@@ -16,7 +16,7 @@ import test_rz_mesh
 
 
 def init_test_db_controller(cfg):
-    ret = dbc.DB_Controller(cfg)
+    ret = dbc.DB_Controller(cfg.db_base_url)
     return ret
 
 def init_test_ws_server(cfg, db_ctl):
diff --git a/src/server/db_controller.py b/src/server/db_controller.py
index f10c7964..82160037 100644
--- a/src/server/db_controller.py
+++ b/src/server/db_controller.py
@@ -15,10 +15,9 @@ class DB_Controller:
     """
     neo4j DB controller
     """
-    def __init__(self, config, db_driver_class=None):
-        self.config = config
+    def __init__(self, rest_api_base_url, db_driver_class=None):
         if not db_driver_class:
-            self.db_driver = DB_Driver_REST(self.config.db_base_url)
+            self.db_driver = DB_Driver_REST(rest_api_base_url)
         else:
             self.db_driver = db_driver_class()
         assert isinstance(self.db_driver, DB_Driver_Base)
diff --git a/src/server/rz_kernel.py b/src/server/rz_kernel.py
index f331ac5c..4e6f920d 100644
--- a/src/server/rz_kernel.py
+++ b/src/server/rz_kernel.py
@@ -93,7 +93,7 @@ class RZ_Kernel(object):
         self.cfg = cfg
         self.cache__rzdoc_name_to_rzdoc = {}
         self.heartbeat_period_sec = 0.5
-        self.db_ctl = DB_Controller(cfg)
+        self.db_ctl = DB_Controller(cfg.db_base_url)
         self.period__db_conn_check = 60
         self.rzdoc_reader_assoc_map = defaultdict(list)