X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Fconfig.py;h=d91f63ac2eaadb5b09b241d314b4bddbb03a2bd8;hb=3ed570c27587e69f384a6e9ab2711d553b7dcde6;hp=84166c1d30ab0477454bf7a529657fe7fd7f6b67;hpb=fec5f179377a891117c4f3f3665df47063a1e1bd;p=functest.git

diff --git a/functest/utils/config.py b/functest/utils/config.py
index 84166c1d3..d91f63ac2 100644
--- a/functest/utils/config.py
+++ b/functest/utils/config.py
@@ -1,27 +1,29 @@
-import os
+#!/usr/bin/env python
 
+import os
 import yaml
 
+import six
+
+from functest.utils import env
+
 
 class Config(object):
     def __init__(self):
-        if 'CONFIG_FUNCTEST_YAML' not in os.environ:
-            raise Exception('CONFIG_FUNCTEST_YAML not configed')
-        self.config_functest = os.environ['CONFIG_FUNCTEST_YAML']
         try:
-            with open(self.config_functest) as f:
+            with open(env.ENV.CONFIG_FUNCTEST_YAML) as f:
                 self.functest_yaml = yaml.safe_load(f)
                 self._parse(None, self.functest_yaml)
-        except:
-            raise Exception('Parse {} failed'.format(self.config_functest))
+        except Exception as error:
+            raise Exception('Parse config failed: {}'.format(str(error)))
         self._set_others()
 
     def _parse(self, attr_now, left_parametes):
-        for param_n, param_v in left_parametes.iteritems():
+        for param_n, param_v in six.iteritems(left_parametes):
             attr_further = self._get_attr_further(attr_now, param_n)
-            if not isinstance(param_v, dict):
+            if attr_further:
                 self.__setattr__(attr_further, param_v)
-            else:
+            if isinstance(param_v, dict):
                 self._parse(attr_further, param_v)
 
     def _get_attr_further(self, attr_now, next):