diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-06 08:26:39 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-06 08:38:20 +0200 |
commit | 62b12b859c0172c737f70493b3052dcef47f96f7 (patch) | |
tree | 49e6fb29bac5b6e95dab8686a271ad576de6d83b /functest/opnfv_tests/openstack/tempest | |
parent | d7c5419ed8d3dcdb59f4f5f254de0c7bb7a0aec6 (diff) |
Rename IMG_PROP to IMAGE_PROPERTIES
Any other env vars are reduced.
Change-Id: Ic2c37d6efd543603a2495f9d2621b66d61710a54
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 9 |
1 files changed, 5 insertions, 4 deletions
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), {})) |