summaryrefslogtreecommitdiff
path: root/cinderclient/v2
diff options
context:
space:
mode:
authorEric Harney <eharney@redhat.com>2019-03-27 11:16:15 -0400
committerSean McGinnis <sean.mcginnis@gmail.com>2019-06-03 14:54:13 +0000
commit0a2bab1d4d01df99bc9594f3f055ad99584949aa (patch)
treee2176a7186cf1cf2395f8a590454985d98bbfc56 /cinderclient/v2
parent953243daa9034e2a37114864cf0ac0b273cd0fc0 (diff)
downloadpython-cinderclient-4.2.1.tar.gz
Fix shell upload-to-image with no volume type4.2.1
Upload-to-image would error after launching the operation if the volume type is None. Closes-Bug: #1821818 Change-Id: I015e0ddfa98d62f25334e2df5effaee72a3988ab (cherry picked from commit 274fa111696783e846561d12f670967ed01ebcbc)
Diffstat (limited to 'cinderclient/v2')
-rw-r--r--cinderclient/v2/volumes.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/cinderclient/v2/volumes.py b/cinderclient/v2/volumes.py
index 18a6e25..c16b3a0 100644
--- a/cinderclient/v2/volumes.py
+++ b/cinderclient/v2/volumes.py
@@ -352,6 +352,8 @@ class VolumeManager(base.ManagerWithFind):
def _action(self, action, volume, info=None, **kwargs):
"""Perform a volume "action."
+
+ :returns: tuple (response, body)
"""
body = {action: info}
self.run_hooks('modify_body_for_action', body, **kwargs)