Refactor improvements

JIRA: FUNCTEST-190

- Deleted unnecessary old scripts
- Fixed healtcheck logging
- Moved config_functest.yaml to /ci/
- Created env var CONFIG_FUNCTEST_YAML pointing to that new location
- Modified all scripts which open config_functest.yaml using the new env var

Change-Id: Ic4f0e40a70c02ac08287a1d621956f602bdee177
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/testcases/Controllers/ODL/CI/odlreport2db.py b/testcases/Controllers/ODL/CI/odlreport2db.py
index 9a87deac0..50c8b096e 100644
--- a/testcases/Controllers/ODL/CI/odlreport2db.py
+++ b/testcases/Controllers/ODL/CI/odlreport2db.py
@@ -23,6 +23,7 @@
 
 import getopt
 import json
+import os
 import sys
 import xmltodict
 import yaml
@@ -116,7 +117,7 @@ def main(argv):
     json.dumps(data, indent=4, separators=(',', ': '))
 
     # Only used from container, we can set up absolute path
-    with open("/home/opnfv/functest/conf/config_functest.yaml") as f:
+    with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
         functest_yaml = yaml.safe_load(f)
         f.close()
 
diff --git a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
index b9ddbf78f..1e278e6a1 100644
--- a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
@@ -30,7 +30,7 @@ args = parser.parse_args()
 """ logging configuration """
 logger = ft_logger.Logger("onos").getLogger()
 
-with open("/home/opnfv/functest/conf/config_functest.yaml") as f:
+with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
     functest_yaml = yaml.safe_load(f)
 f.close()