commit 0310ca184971a7325aaf32c16b3e40628bf290f7
author Matteo Scandolo <teo@opennetworking.org> Tue Jun 12 12:15:19 2018 -0700
committer Matteo Scandolo <teo@opennetworking.org> Tue Jun 12 12:15:19 2018 -0700
tree ef61a0b5dbdabbba1c30507d1a7fdc1c9c6b4975
parent 769a5a4166e55224db36988694d99d1f22b6b647

[CORD-3022] Splitting config

Change-Id: I841d7173729a1c3eb98c098e0b3b6a90de18dcba

xos/synchronizer/config.yaml

diff --git a/xos/synchronizer/vrouter_config.yaml b/xos/synchronizer/config.yaml
similarity index 82%
rename from xos/synchronizer/vrouter_config.yaml
rename to xos/synchronizer/config.yaml
index 274ba24..df56433 100644
--- a/xos/synchronizer/vrouter_config.yaml
+++ b/xos/synchronizer/config.yaml
@@ -15,13 +15,21 @@
 
 
 name: vrouter
-accessor:
-  username: xosadmin@opencord.org
-  password: "@/opt/xos/services/vrouter/credentials/xosadmin@opencord.org"
 required_models:
   - VRouterService
   - VRouterServiceInstance
+  - VRouterStaticRoute
 dependency_graph: "/opt/xos/synchronizers/vrouter/model-deps"
 steps_dir: "/opt/xos/synchronizers/vrouter/steps"
 sys_dir: "/opt/xos/synchronizers/vrouter/sys"
 models_dir: "/opt/xos/synchronizers/vrouter/models"
+logging:
+  version: 1
+  handlers:
+    console:
+      class: logging.StreamHandler
+  loggers:
+    'multistructlog':
+      handlers:
+          - console
+      level: DEBUG

xos/synchronizer/vrouter-synchronizer.py

diff --git a/xos/synchronizer/vrouter-synchronizer.py b/xos/synchronizer/vrouter-synchronizer.py
index 2850bd2..6eda455 100644
--- a/xos/synchronizer/vrouter-synchronizer.py
+++ b/xos/synchronizer/vrouter-synchronizer.py
@@ -21,9 +21,13 @@
 import sys
 from xosconfig import Config
 
-config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/vrouter_config.yaml')
+base_config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/config.yaml')
+mounted_config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/mounted_config.yaml')
 
-Config.init(config_file, 'synchronizer-config-schema.yaml')
+if os.path.isfile(mounted_config_file):
+    Config.init(base_config_file, 'synchronizer-config-schema.yaml', mounted_config_file)
+else:
+    Config.init(base_config_file, 'synchronizer-config-schema.yaml')
 
 synchronizer_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../synchronizers/new_base")
 sys.path.append(synchronizer_path)