X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Fenv.py;h=2fb766d3275954ce4cff7dc4b597fc4fc5b62d44;hb=3900d3c3efa75e0a382183154c534e67b199152c;hp=7e4df2ea56272489b1b02812664f0d7c1d77e820;hpb=542de3204e8fa7730a6c837b3f751b677343644c;p=functest.git diff --git a/functest/utils/env.py b/functest/utils/env.py index 7e4df2ea5..2fb766d32 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -1,6 +1,12 @@ +#!/usr/bin/env python + +import pkg_resources import os import re +import six + + default_envs = { 'NODE_NAME': 'unknown_pod', 'CI_DEBUG': 'false', @@ -10,16 +16,19 @@ default_envs = { 'INSTALLER_IP': None, 'BUILD_TAG': None, 'OS_ENDPOINT_TYPE': None, - 'OS_AUTH_URL': None + 'OS_AUTH_URL': None, + 'CONFIG_FUNCTEST_YAML': pkg_resources.resource_filename( + 'functest', 'ci/config_functest.yaml'), + 'OS_INSECURE': '' } class Environment(object): def __init__(self): - for k, v in os.environ.iteritems(): + for k, v in six.iteritems(os.environ): self.__setattr__(k, v) - for k, v in default_envs.iteritems(): + for k, v in six.iteritems(default_envs): if k not in os.environ: self.__setattr__(k, v) self._set_ci_run()