From 904377462f58464937d4cafeb8c432f024a85bd4 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 14 Oct 2018 12:08:03 +0200 Subject: Fix image properties parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It removes useless spaces and now conforms with oslo.conf dict. New helpers and unit tests are available. Change-Id: I20335c5e5c3840cc872e158c6072d97a3f2cb98c Signed-off-by: Cédric Ollivier --- functest/core/singlevm.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'functest/core') 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), {})) -- cgit 1.2.3-korg