diff options
Diffstat (limited to 'functest/core/singlevm.py')
| -rw-r--r-- | functest/core/singlevm.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index 71ed0690d..d1806eb12 100644 --- a/functest/core/singlevm.py +++ b/functest/core/singlevm.py @@ -23,6 +23,7 @@ from xtesting.core import testcase from functest.core import tenantnetwork from functest.utils import config +from functest.utils import env class VmReady1(tenantnetwork.TenantNetwork1): @@ -73,6 +74,11 @@ class VmReady1(tenantnetwork.TenantNetwork1): """ assert self.cloud extra_properties = self.extra_properties.copy() + if env.get('IMAGE_PROPERTIES'): + extra_properties.update( + dict((k.strip(), v.strip()) for k, v in ( + item.split(': ') for item in env.get( + 'IMAGE_PROPERTIES').split(',')))) extra_properties.update( getattr(config.CONF, '{}_extra_properties'.format( self.case_name), {})) @@ -104,6 +110,11 @@ class VmReady1(tenantnetwork.TenantNetwork1): """ assert self.cloud extra_alt_properties = self.extra_alt_properties.copy() + if env.get('IMAGE_PROPERTIES'): + extra_alt_properties.update( + dict((k.strip(), v.strip()) for k, v in ( + item.split(': ') for item in env.get( + 'IMAGE_PROPERTIES').split(',')))) extra_alt_properties.update( getattr(config.CONF, '{}_extra_alt_properties'.format( self.case_name), {})) |