Merge "Use constants for Functest config file"

2 files changed, 10 insertions, 4 deletions

diff --git a/functest/utils/constants.py b/functest/utils/constants.py
index d8a1d54d..2184c472 100644
--- a/functest/utils/constants.py
+++ b/functest/utils/constants.py
@@ -8,11 +8,17 @@ import six
 from functest.utils import config
 from functest.utils import env
 
+CONFIG_FUNCTEST_YAML = pkg_resources.resource_filename(
+    'functest', 'ci/config_functest.yaml')
+
+ENV_FILE = '/home/opnfv/functest/conf/env_file'
+
 
 class Constants(object):  # pylint: disable=too-few-public-methods
 
-    CONFIG_FUNCTEST_YAML = pkg_resources.resource_filename(
-        'functest', 'ci/config_functest.yaml')
+    # Backward compatibility (waiting for SDNVPN and SFC)
+    CONFIG_FUNCTEST_YAML = CONFIG_FUNCTEST_YAML
+    env_file = ENV_FILE
 
     def __init__(self):
         for attr_n, attr_v in six.iteritems(config.CONF.__dict__):
diff --git a/functest/utils/env.py b/functest/utils/env.py
index 0c0515ba..e75b17d1 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -37,10 +37,10 @@ def get(env_var):
 
 class Environment(object):  # pylint: disable=too-few-public-methods
 
-    # Backward compatibilty (waiting for SDNVPN and SFC)
+    # Backward compatibility (waiting for SDNVPN and SFC)
     def __init__(self):
         for key, _ in six.iteritems(INPUTS):
             setattr(self, key, get(key))
 
-# Backward compatibilty (waiting for SDNVPN and SFC)
+# Backward compatibility (waiting for SDNVPN and SFC)
 ENV = Environment()