diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-10-06 07:05:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-06 07:05:21 +0000 |
| commit | 427547d5680878dabfa1e8d1e53fdb2921fd01ab (patch) | |
| tree | 0372ce08478efe9ee6a55b26dc35e75fb6dde966 /functest/opnfv_tests/openstack/tempest | |
| parent | 6b0fa7ecb5aa0c0dead1d16c2811f5c47347a091 (diff) | |
| parent | 62b12b859c0172c737f70493b3052dcef47f96f7 (diff) | |
Merge "Rename IMG_PROP to IMAGE_PROPERTIES"
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 4c5308bdf..c2ff98f6c 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -382,10 +382,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), {})) |