[CORD-1362] Remove old config module
Change-Id: Ic463174e1235fd732411795e52ff8570863f234d
diff --git a/lib/xos-config/tests/config_test.py b/lib/xos-config/tests/config_test.py
index b98b817..36869b3 100644
--- a/lib/xos-config/tests/config_test.py
+++ b/lib/xos-config/tests/config_test.py
@@ -133,7 +133,15 @@
"file": "/var/log/xos.log",
})
- def _test_get_missing_param(self):
+ def test_get_config_file(self):
+ """
+ [XOS-Config] Should return the config file in use
+ """
+ Config.init(sample_conf)
+ res = Config.get_config_file()
+ self.assertEqual(res, sample_conf)
+
+ def test_get_missing_param(self):
"""
[XOS-Config] Should raise reading a missing param
"""
diff --git a/lib/xos-config/xosconfig/config.py b/lib/xos-config/xosconfig/config.py
index 3e0482d..db3b5c1 100644
--- a/lib/xos-config/xosconfig/config.py
+++ b/lib/xos-config/xosconfig/config.py
@@ -8,6 +8,7 @@
DEFAULT_CONFIG_FILE = "/opt/xos/xos_config.yaml"
DEFAULT_CONFIG_SCHEMA = 'xos-config-schema.yaml'
INITIALIZED = False
+CONFIG_FILE = None
CONFIG = {}
class Config:
@@ -24,6 +25,7 @@
global INITIALIZED
global CONFIG
+ global CONFIG_FILE
# the config module can be initialized only one
if INITIALIZED:
raise Exception('[XOS-Config] Module already initialized')
@@ -44,9 +46,15 @@
if Config.get_cli_param(sys.argv):
config_schema = Config.get_cli_param(sys.argv)
+
+ CONFIG_FILE = config_file
CONFIG = Config.read_config(config_file, config_schema)
@staticmethod
+ def get_config_file():
+ return CONFIG_FILE
+
+ @staticmethod
def clear():
global INITIALIZED
INITIALIZED = False