diff options
| author |   Delia Popescu <delia.popescu@enea.com> | 2018-09-06 18:37:11 +0300 |
|---|---|---|
| committer | Delia Popescu <delia.popescu@enea.com> | 2018-10-05 12:06:59 +0000 |
| commit | d7c5419ed8d3dcdb59f4f5f254de0c7bb7a0aec6 (patch) | |
| tree | 0f08b9ad3ef2d6f288356696c313aa7922bc2619 /functest/opnfv_tests/openstack/tempest | |
| parent | 95bd62a751501caf0755e79e33de7a42f72deb27 (diff) | |
Use environment variable for image properties
Use IMG_PROP environment variable to read extra image
properties.
Set image_extra_properties for scsi volume types
without file patch, but using IMG_PROP env variable
IMG_PROP is defined through releng.
Image extra_properties will continue to get updates from
functest config file
With this change, remove unnecessary parameters from arm patch
Related to:https://gerrit.opnfv.org/gerrit/#/c/63203/
JIRA:ARMBAND-402
Change-Id: I64139240751b1e109bbe24ba32f487ccd98b9a92
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index f30bbc552..ddd0d640d 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -367,6 +367,10 @@ 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(',')))) extra_properties.update( getattr(config.CONF, '{}_extra_properties'.format( self.case_name), {})) |