Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix domain in tenant creation
[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
..
d91f63a
--- a/
functest/utils/config.py
+++ b/
functest/utils/config.py
@@
-1,8
+1,11
@@
-import os
+#!/usr/bin/env python
+import os
import yaml
import yaml
-import env
+import six
+
+from functest.utils import env
class Config(object):
class Config(object):
@@
-16,7
+19,7
@@
class Config(object):
self._set_others()
def _parse(self, attr_now, left_parametes):
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)
attr_further = self._get_attr_further(attr_now, param_n)
if attr_further:
self.__setattr__(attr_further, param_v)
@@
-32,8
+35,3
@@
class Config(object):
CONF = Config()
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