Ensure that all energy modules are fully covered

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

diff --git a/functest/utils/config.py b/functest/utils/config.py
old mode 100755 (executable)
new mode 100644 (file)
index b5b8450..6bb4f58
--- a/functest/utils/config.py
+++ b/functest/utils/config.py
@@ -1,8 +1,10 @@
-import os
+#!/usr/bin/env python
 
 import yaml
 
-import env
+import six
+
+from functest.utils import env
 
 
 class Config(object):
@@ -13,10 +15,9 @@ class Config(object):
                 self._parse(None, self.functest_yaml)
         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 attr_further:
                 self.__setattr__(attr_further, param_v)
@@ -27,13 +28,5 @@ class Config(object):
         return attr_now if next == 'general' else (
             '{}_{}'.format(attr_now, next) if attr_now else next)
 
-    def _set_others(self):
-        self.env_active = os.path.join(self.dir_functest_conf, "env_active")
-
 
 CONF = Config()
-
-if __name__ == "__main__":
-    print CONF.vnf_cloudify_ims
-    print CONF.vnf_cloudify_ims_tenant_images
-    print CONF.vnf_cloudify_ims_tenant_images_centos_7