[CORD-3022] Splitting config
Change-Id: I6ebad473e2014ea99484d3738cd35631e3433dc6
diff --git a/xos/synchronizer/vsg_hw_config.yaml b/xos/synchronizer/config.yaml
similarity index 84%
rename from xos/synchronizer/vsg_hw_config.yaml
rename to xos/synchronizer/config.yaml
index 4ea0b5b..0b5a2b4 100644
--- a/xos/synchronizer/vsg_hw_config.yaml
+++ b/xos/synchronizer/config.yaml
@@ -19,11 +19,18 @@
- VSGHWService
- VSGHWServiceInstance
- ServiceInstanceLink
-accessor:
- username: xosadmin@opencord.org
- password: "@/opt/xos/services/vsg-hw/credentials/xosadmin@opencord.org"
dependency_graph: "/opt/xos/synchronizers/vsg-hw/model-deps"
steps_dir: "/opt/xos/synchronizers/vsg-hw/steps"
-sys_dir: "/opt/xos/synchronizers/vsg-hw/sys"
model_policies_dir: "/opt/xos/synchronizers/vsg-hw/model_policies"
+sys_dir: "/opt/xos/synchronizers/vsg-hw/sys"
models_dir: "/opt/xos/synchronizers/vsg-hw/models"
+logging:
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ loggers:
+ 'multistructlog':
+ handlers:
+ - console
+ level: DEBUG
diff --git a/xos/synchronizer/vsg-hw-synchronizer.py b/xos/synchronizer/vsg-hw-synchronizer.py
index 22ec365..337472d 100755
--- a/xos/synchronizer/vsg-hw-synchronizer.py
+++ b/xos/synchronizer/vsg-hw-synchronizer.py
@@ -21,9 +21,13 @@
import sys
from xosconfig import Config
-config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/vsg_hw_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')
observer_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),"../../synchronizers/new_base")
sys.path.append(observer_path)