Merge "Fix how tier_handler is imported"

[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..6b5021a
--- 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):
@@ -16,7 +18,7 @@ class Config(object):
         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)
@@ -28,12 +30,6 @@ class Config(object):
             '{}_{}'.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")
-
+        pass
 
 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