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 image properties parsing
[functest.git]
/
functest
/
core
/
singlevm.py
diff --git
a/functest/core/singlevm.py
b/functest/core/singlevm.py
index
71ed069
..
b3a1417
100644
(file)
--- a/
functest/core/singlevm.py
+++ b/
functest/core/singlevm.py
@@
-23,6
+23,8
@@
from xtesting.core import testcase
from functest.core import tenantnetwork
from functest.utils import config
from functest.core import tenantnetwork
from functest.utils import config
+from functest.utils import env
+from functest.utils import functest_utils
class VmReady1(tenantnetwork.TenantNetwork1):
class VmReady1(tenantnetwork.TenantNetwork1):
@@
-73,6
+75,10
@@
class VmReady1(tenantnetwork.TenantNetwork1):
"""
assert self.cloud
extra_properties = self.extra_properties.copy()
"""
assert self.cloud
extra_properties = self.extra_properties.copy()
+ if env.get('IMAGE_PROPERTIES'):
+ extra_properties.update(
+ functest_utils.convert_ini_to_dict(
+ env.get('IMAGE_PROPERTIES')))
extra_properties.update(
getattr(config.CONF, '{}_extra_properties'.format(
self.case_name), {}))
extra_properties.update(
getattr(config.CONF, '{}_extra_properties'.format(
self.case_name), {}))
@@
-104,6
+110,10
@@
class VmReady1(tenantnetwork.TenantNetwork1):
"""
assert self.cloud
extra_alt_properties = self.extra_alt_properties.copy()
"""
assert self.cloud
extra_alt_properties = self.extra_alt_properties.copy()
+ if env.get('IMAGE_PROPERTIES'):
+ extra_alt_properties.update(
+ functest_utils.convert_ini_to_dict(
+ env.get('IMAGE_PROPERTIES')))
extra_alt_properties.update(
getattr(config.CONF, '{}_extra_alt_properties'.format(
self.case_name), {}))
extra_alt_properties.update(
getattr(config.CONF, '{}_extra_alt_properties'.format(
self.case_name), {}))