aboutsummaryrefslogtreecommitdiffstats
path: root/functest/utils
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-02-22 16:36:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-22 16:36:55 +0000
commitd701e9737f83ff29faba830df426b5a75c9746b1 (patch)
tree8e6299dcd2cfcd3d773cc523cb1c5a387d0d9681 /functest/utils
parent01b28068c727b54c34d5b20e3baad4c4e31d7761 (diff)
parentfdbfe10922d09ee3dad407b10be0205082dddce3 (diff)
Merge "Use constants for Functest config file"
Diffstat (limited to 'functest/utils')
-rw-r--r--functest/utils/constants.py10
-rw-r--r--functest/utils/env.py4
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()