diff options
| author |   chenjiankun <chenjiankun1@huawei.com> | 2018-04-03 06:23:42 +0000 |
|---|---|---|
| committer | chenjiankun <chenjiankun1@huawei.com> | 2018-04-12 08:00:05 +0000 |
| commit | 5ac59e495d74b64ab377f1ba25bb00b11da14e67 (patch) | |
| tree | 9a12de435a5c14a7f3477b931a120fc660b63bdb /yardstick/common/utils.py | |
| parent | 374a6caf766c0503f114a83cc20144f72b10ab45 (diff) | |
Bugfix: Can't get image list in API
JIRA: YARDSTICK-1110
To match OpenStack Pike release, we upgrade novaclient from 7.1.1 to 9.1.1.
And the client interface has changed, it no longer has nova_client.images attribute.
So I use shade instead. Later will change all same issue.
Change-Id: Ie4f54069d4346e44e2ad925439930504b945cbad
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'yardstick/common/utils.py')
| -rw-r--r-- | yardstick/common/utils.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/yardstick/common/utils.py b/yardstick/common/utils.py index 357f66be8..44cc92a7c 100644 --- a/yardstick/common/utils.py +++ b/yardstick/common/utils.py @@ -136,6 +136,11 @@ def source_env(env_file): p = subprocess.Popen(". %s; env" % env_file, stdout=subprocess.PIPE, shell=True) output = p.communicate()[0] + + # sometimes output type would be binary_type, and it don't have splitlines + # method, so we need to decode + if isinstance(output, six.binary_type): + output = encodeutils.safe_decode(output) env = dict(line.split('=', 1) for line in output.splitlines() if '=' in line) os.environ.update(env) return env |