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-08 19:42:40 +0200 |
| commit | eb732eeb0b5659ae2c9452263713be7db8d5003d (patch) | |
| tree | fbe96103904ae3478767db597a9f331e0d6a23bc /functest/opnfv_tests/openstack/tempest/tempest.py | |
| parent | 41a4ee5170d6f46042d0ba365d78a21be6ec5b1b (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>
(cherry picked from commit 62b12b859c0172c737f70493b3052dcef47f96f7)
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py')
| -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), {})) |