diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-10-14 11:26:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-14 11:26:50 +0000 |
| commit | 0a0b2b3e644e4ce353b37fa340954b78a590e20f (patch) | |
| tree | ab2f81d4f7d239411a7abe7590007991bd4df9d3 /functest/core | |
| parent | 1a22e73c850c450305764c784c86dbc067e65dae (diff) | |
| parent | 904377462f58464937d4cafeb8c432f024a85bd4 (diff) | |
Merge "Fix image properties parsing"
Diffstat (limited to 'functest/core')
| -rw-r--r-- | functest/core/singlevm.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index d1806eb12..b3a1417f6 100644 --- a/functest/core/singlevm.py +++ b/functest/core/singlevm.py @@ -24,6 +24,7 @@ from xtesting.core import testcase 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): @@ -76,9 +77,8 @@ class VmReady1(tenantnetwork.TenantNetwork1): 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(',')))) + functest_utils.convert_ini_to_dict( + env.get('IMAGE_PROPERTIES'))) extra_properties.update( getattr(config.CONF, '{}_extra_properties'.format( self.case_name), {})) @@ -112,9 +112,8 @@ class VmReady1(tenantnetwork.TenantNetwork1): 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(',')))) + functest_utils.convert_ini_to_dict( + env.get('IMAGE_PROPERTIES'))) extra_alt_properties.update( getattr(config.CONF, '{}_extra_alt_properties'.format( self.case_name), {})) |