Concat both dynamic and static roles in tempest.conf

[functest.git] / functest / utils / constants.py

diff --git a/functest/utils/constants.py b/functest/utils/constants.py
index 2184c47..5e7c244 100644 (file)
--- a/functest/utils/constants.py
+++ b/functest/utils/constants.py
@@ -3,28 +3,9 @@
 # pylint: disable=missing-docstring
 
 import pkg_resources
-import six
-
-from functest.utils import config
-from functest.utils import env
+from xtesting.utils import constants
 
 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
-
-    # 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__):
-            setattr(self, attr_n, attr_v)
-        for env_n, env_v in six.iteritems(env.ENV.__dict__):
-            setattr(self, env_n, env_v)
-
-
-CONST = Constants()
+ENV_FILE = constants.ENV_FILE