[CORD-3022] Splitting config
Change-Id: I6769831592d63264502a634d9461bd92d30d2b97
diff --git a/samples/subscriber.yaml b/samples/subscriber.yaml
index fe8d646..4b38bb4 100644
--- a/samples/subscriber.yaml
+++ b/samples/subscriber.yaml
@@ -25,11 +25,6 @@
type: tosca.nodes.RCORDSubscriber
properties:
name: My House
- service_specific_id: "123"
- firewall_enable: false
- cdn_enable: false
- url_filter_enable: false
- url_filter_level: R
c_tag: 111
onu_device: BRCM1234
uni_port_id: 101
diff --git a/xos/synchronizer/volt_config.yaml b/xos/synchronizer/config.yaml
similarity index 80%
rename from xos/synchronizer/volt_config.yaml
rename to xos/synchronizer/config.yaml
index b3209aa..8a1a51e 100644
--- a/xos/synchronizer/volt_config.yaml
+++ b/xos/synchronizer/config.yaml
@@ -15,9 +15,6 @@
name: volt
-accessor:
- username: xosadmin@opencord.org
- password: "@/opt/xos/services/volt/credentials/xosadmin@opencord.org"
required_models:
- VOLTService
- VOLTServiceInstance
@@ -28,20 +25,14 @@
models_dir: "/opt/xos/synchronizers/volt/models"
steps_dir: "/opt/xos/synchronizers/volt/steps"
pull_steps_dir: "/opt/xos/synchronizers/volt/pull_steps"
-
+event_steps_dir: "/opt/xos/synchronizers/volt/event_steps"
logging:
version: 1
handlers:
console:
class: logging.StreamHandler
- file:
- class: logging.handlers.RotatingFileHandler
- filename: /var/log/xos.log
- maxBytes: 10485760
- backupCount: 5
loggers:
'multistructlog':
handlers:
- console
- - file
level: DEBUG
diff --git a/xos/synchronizer/volt-synchronizer.py b/xos/synchronizer/volt-synchronizer.py
index 3443ca5..337472d 100755
--- a/xos/synchronizer/volt-synchronizer.py
+++ b/xos/synchronizer/volt-synchronizer.py
@@ -21,8 +21,13 @@
import sys
from xosconfig import Config
-config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/volt_config.yaml')
-Config.init(config_file, 'synchronizer-config-schema.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')
+
+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)