Merge "Conform constants.py with the minimal standards"

1 files changed, 8 insertions, 11 deletions

diff --git a/functest/utils/constants.py b/functest/utils/constants.py
index 2e8eb3f4..75c97c76 100755..100644
--- a/functest/utils/constants.py
+++ b/functest/utils/constants.py
@@ -1,20 +1,17 @@
-import config
-import env
+#!/usr/bin/env python
+
+import six
+
+from functest.utils import config
+from functest.utils import env
 
 
 class Constants(object):
     def __init__(self):
-        for attr_n, attr_v in config.CONF.__dict__.iteritems():
+        for attr_n, attr_v in six.iteritems(config.CONF.__dict__):
             self.__setattr__(attr_n, attr_v)
-        for env_n, env_v in env.ENV.__dict__.iteritems():
+        for env_n, env_v in six.iteritems(env.ENV.__dict__):
             self.__setattr__(env_n, env_v)
 
 
 CONST = Constants()
-
-if __name__ == '__main__':
-    print CONST.__dict__
-    print CONST.NODE_NAME
-    print CONST.vIMS_clearwater_blueprint_url
-    print CONST.vIMS_clearwater_blueprint_file_name
-    print CONST.vIMS_clearwater_blueprint_name