[CORD-3022] Splitting config and removing unused files
Change-Id: I559697e1b8a6ba54ce1761dfcd31d5119dfd102d
diff --git a/xos/synchronizer/Dockerfile.synchronizer b/xos/synchronizer/Dockerfile.synchronizer
deleted file mode 100644
index cd4da41..0000000
--- a/xos/synchronizer/Dockerfile.synchronizer
+++ /dev/null
@@ -1,59 +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.
-
-
-# docker build -t xosproject/progran-synchronizer:candidate -f Dockerfile.synchronizer .
-
-# xosproject/progran-synchronizer
-
-FROM xosproject/xos-synchronizer-base:candidate
-
-COPY . /opt/xos/synchronizers/progran
-
-ENTRYPOINT []
-
-WORKDIR "/opt/xos/synchronizers/progran"
-
-# Label image
-ARG org_label_schema_schema_version=1.0
-ARG org_label_schema_name=progran-synchronizer
-ARG org_label_schema_version=unknown
-ARG org_label_schema_vcs_url=unknown
-ARG org_label_schema_vcs_ref=unknown
-ARG org_label_schema_build_date=unknown
-ARG org_opencord_vcs_commit_date=unknown
-ARG org_opencord_component_chameleon_version=unknown
-ARG org_opencord_component_chameleon_vcs_url=unknown
-ARG org_opencord_component_chameleon_vcs_ref=unknown
-ARG org_opencord_component_xos_version=unknown
-ARG org_opencord_component_xos_vcs_url=unknown
-ARG org_opencord_component_xos_vcs_ref=unknown
-
-LABEL org.label-schema.schema-version=$org_label_schema_schema_version \
- org.label-schema.name=$org_label_schema_name \
- org.label-schema.version=$org_label_schema_version \
- org.label-schema.vcs-url=$org_label_schema_vcs_url \
- org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
- org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
- org.opencord.component.chameleon.version=$org_opencord_component_chameleon_version \
- org.opencord.component.chameleon.vcs-url=$org_opencord_component_chameleon_vcs_url \
- org.opencord.component.chameleon.vcs-ref=$org_opencord_component_chameleon_vcs_ref \
- org.opencord.component.xos.version=$org_opencord_component_xos_version \
- 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/progran; python progran-synchronizer.py"
-
diff --git a/xos/synchronizer/progran_config.yml b/xos/synchronizer/config.yaml
similarity index 71%
rename from xos/synchronizer/progran_config.yml
rename to xos/synchronizer/config.yaml
index d3b209c..a3f2048 100644
--- a/xos/synchronizer/progran_config.yml
+++ b/xos/synchronizer/config.yaml
@@ -15,34 +15,22 @@
name: progran
-accessor:
- username: xosadmin@opencord.org
- password: "@/opt/xos/services/progran/credentials/xosadmin@opencord.org"
required_models:
- ProgranService
- ProgranServiceInstance
- MCordSubscriberInstance
- ENodeB
- Handover
-dependency_graph: "/opt/xos/synchronizers/progran/model_deps"
steps_dir: "/opt/xos/synchronizers/progran/steps"
sys_dir: "/opt/xos/synchronizers/progran/sys"
models_dir: "/opt/xos/synchronizers/progran/models"
-#model_policies_dir: "/opt/xos/synchronizers/progran/model_policies"
-
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
\ No newline at end of file
diff --git a/xos/synchronizer/model_deps b/xos/synchronizer/model_deps
deleted file mode 100644
index 9e26dfe..0000000
--- a/xos/synchronizer/model_deps
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/xos/synchronizer/progran-synchronizer.py b/xos/synchronizer/progran-synchronizer.py
index 9632c8e..37fbd6b 100644
--- a/xos/synchronizer/progran-synchronizer.py
+++ b/xos/synchronizer/progran-synchronizer.py
@@ -23,8 +23,13 @@
import sys
from xosconfig import Config
-config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/progran_config.yml')
-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")