diff options
author | Delia Popescu <delia.popescu@enea.com> | 2018-10-09 12:03:58 +0300 |
---|---|---|
committer | Delia Popescu <delia.popescu@enea.com> | 2018-10-16 13:51:52 +0000 |
commit | b233980c6207848d48967f1e8125e41e309a6f5a (patch) | |
tree | 1af54123cf10dfa6334a06e3858f5fdbb26c2b9d /functest/utils | |
parent | 1d866c412c5803fed1c8e68a9e763577d3cd83f1 (diff) |
Ease configuring extra specs via env vars
Ease configuring flavor extra specs, as well as
image extra specs.
Set environment variables for image_properties and
flavor extra_specs for ovs|fdio scenario from the start.
Image extra_properties and flavor extra_specs
will continue to get updates from functest config file
but so will from IMAGE_PROPERTIES and FLAVOR_EXTRA_SPECS
env variables.
Change-Id: Ie1c69e66d2e2e158915d214402fe44d9991c56d3
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
(cherry picked from commit 1a00b9de56ef65eef2a0b269a514cb25491ac54b)
Diffstat (limited to 'functest/utils')
-rw-r--r-- | functest/utils/env.py | 1 | ||||
-rw-r--r-- | functest/utils/functest_utils.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/functest/utils/env.py b/functest/utils/env.py index d7c0814c4..41d1a4d86 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -33,6 +33,7 @@ INPUTS = { 'ENERGY_RECORDER_API_PASSWORD': env.INPUTS['ENERGY_RECORDER_API_PASSWORD'], 'VOLUME_DEVICE_NAME': 'vdb', 'IMAGE_PROPERTIES': '', + 'FLAVOR_EXTRA_SPECS': '', 'NAMESERVER': '8.8.8.8', 'NEW_USER_ROLE': 'Member', 'USE_DYNAMIC_CREDENTIALS': 'True', diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index 7ae74393d..b49337de2 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -155,7 +155,7 @@ def convert_ini_to_dict(value): "Convert oslo.conf input to dict" assert isinstance(value, str) try: - return {k: v for k, v in (x.split(':') for x in value.split(','))} + return {k: v for k, v in (x.rsplit(':', 1) for x in value.split(','))} except ValueError: return {} |