openstack
/
python-zunclient
Code Issues Proposed changes

Fix error message on mounts argument 

Change-Id: I17e9a03e08a798ed0dc0b9f773dfe6a8db7e5ebf
Closes-Bug: #1813516
This commit is contained in:
Hongbin Lu 2019-01-28 03:38:25 +00:00
parent ed3d2a3ae3
commit 56d7bf2c84
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zunclient/common/utils.py
View File

@ -215,7 +215,7 @@ def parse_mounts(mounts):
"or use --mount size=<size>,destination=<path> to create "
"a new volume and mount to the container, "
"or use --mount type=bind,source=<file>,destination=<path> "
"to inject file into a path in the container, ")
"to inject file into a path in the container.")
parsed_mounts = []
for mount in mounts:
keys = ["source", "destination", "size", "type"]
@ -235,13 +235,14 @@ def parse_mounts(mounts):
raise apiexec.CommandError(err_msg % mnt)
if not mount_info.get('destination'):
raise apiexec.CommandError(err_msg % mnt)
raise apiexec.CommandError(err_msg % mount)
if not mount_info.get('source') and not mount_info.get('size'):
raise apiexec.CommandError(err_msg % mnt)
raise apiexec.CommandError(err_msg % mount)
type = mount_info.get('type', 'volume')
if type not in ('volume', 'bind'):
mnt = "type=%s" % type
raise apiexec.CommandError(err_msg % mnt)
if type == 'bind':