From 62b12b859c0172c737f70493b3052dcef47f96f7 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 6 Oct 2018 08:26:39 +0200 Subject: Rename IMG_PROP to IMAGE_PROPERTIES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Any other env vars are reduced. Change-Id: Ic2c37d6efd543603a2495f9d2621b66d61710a54 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/tempest/tempest.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'functest/opnfv_tests/openstack/tempest') diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index ddd0d640d..b3108b4fe 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -367,10 +367,11 @@ class TempestCommon(singlevm.VmReady2): config.CONF, '{}_image_format'.format(self.case_name), self.image_format)) extra_properties = self.extra_properties.copy() - if env.get('IMG_PROP'): - extra_properties.update(dict((k.strip(), v.strip()) for k, v in - (item.split(': ') for item in - env.get('IMG_PROP').split(',')))) + 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), {})) -- cgit 1.2.3-korg