[CORD-3022] Splitting config and removing unused files
Change-Id: I7ffad2ca8b037764e591f2702bcf7a0b776ffdcd
diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index 3ca168a..3845201 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -54,4 +54,4 @@
org.opencord.component.xos.vcs-url=$org_opencord_component_xos_vcs_url \
org.opencord.component.xos.vcs-ref=$org_opencord_component_xos_vcs_ref
-CMD bash -c "service filebeat start; cd /opt/xos/synchronizers/internetemulator; ./run-from-api.sh"
+CMD ["/usr/bin/python", "/opt/xos/synchronizers/internetemulator/internetemulator-synchronizer.py"]
diff --git a/xos/synchronizer/internetemulator_config.yaml b/xos/synchronizer/config.yaml
similarity index 81%
rename from xos/synchronizer/internetemulator_config.yaml
rename to xos/synchronizer/config.yaml
index f21d67e..2863bc8 100644
--- a/xos/synchronizer/internetemulator_config.yaml
+++ b/xos/synchronizer/config.yaml
@@ -15,15 +15,20 @@
name: internetemulator
-accessor:
- username: xosadmin@opencord.org
- password: "@/opt/xos/services/internetemulator/credentials/xosadmin@opencord.org"
required_models:
- InternetEmulatorService
- InternetEmulatorServiceInstance
- - ServiceDependency
-dependency_graph: "/opt/xos/synchronizers/internetemulator/model-deps"
steps_dir: "/opt/xos/synchronizers/internetemulator/steps"
sys_dir: "/opt/xos/synchronizers/internetemulator/sys"
-models_dir: "/opt/xos/synchronizers/internetemulator/models"
model_policies_dir: "/opt/xos/synchronizers/internetemulator/model_policies"
+models_dir: "/opt/xos/synchronizers/internetemulator/models"
+logging:
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ loggers:
+ 'multistructlog':
+ handlers:
+ - console
+ level: DEBUG
diff --git a/xos/synchronizer/internetemulator-synchronizer.py b/xos/synchronizer/internetemulator-synchronizer.py
index f9cde76..112149a 100644
--- a/xos/synchronizer/internetemulator-synchronizer.py
+++ b/xos/synchronizer/internetemulator-synchronizer.py
@@ -23,8 +23,13 @@
import sys
from xosconfig import Config
-config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/internetemulator_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')
synchronizer_path = os.path.join(os.path.dirname(
os.path.realpath(__file__)), "../../synchronizers/new_base")
diff --git a/xos/synchronizer/model-deps b/xos/synchronizer/model-deps
deleted file mode 100644
index 0967ef4..0000000
--- a/xos/synchronizer/model-deps
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/xos/synchronizer/run-from-api.sh b/xos/synchronizer/run-from-api.sh
deleted file mode 100755
index 681873c..0000000
--- a/xos/synchronizer/run-from-api.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-python internetemulator-synchronizer.py