Change in vdsm[master]: vm payload: clarify intent of supporting multiple files

gpadgett at redhat.com gpadgett at redhat.com
Tue Jun 25 12:09:03 UTC 2013


Greg Padgett has uploaded a new change for review.

Change subject: vm payload: clarify intent of supporting multiple files
......................................................................

vm payload: clarify intent of supporting multiple files

With cloud-init integration now using payloads with multiple files,
clarify that this is supported in the payload code.

Change-Id: I3b2a9828eb1fee5bc5c25d5faa90b387473e820e
Bug-Url: https://bugzilla.redhat.com/619761
Signed-off-by: Greg Padgett <gpadgett at redhat.com>
---
M vdsm/clientIF.py
1 file changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/16073/1

diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 073523f..4643d3f 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -300,7 +300,7 @@
                     'vmPayload' in drive['specParams']:
                 '''
                 vmPayload is a key in specParams
-                'vmPayload': {'file': {'filename': 'content'}}
+                'vmPayload': {'file': {'filename': 'content', ...}}
                 '''
                 mkFsNames = {'cdrom': 'mkIsoFs', 'floppy': 'mkFloppyFs'}
                 try:
@@ -310,10 +310,8 @@
                     raise vm.VolumeError("Unsupported 'device': %s in "
                                          "drive: %" % (drive['device'], drive))
                 else:
-                    # the only reason for adding this variable is that
-                    # you can not write this without breaking PEP8
-                    file_name = drive['specParams']['vmPayload']['file']
-                    volPath = mkFsFunction(vmId, file_name)
+                    files = drive['specParams']['vmPayload']['file']
+                    volPath = mkFsFunction(vmId, files)
 
             elif "path" in drive:
                 volPath = drive['path']


-- 
To view, visit http://gerrit.ovirt.org/16073
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b2a9828eb1fee5bc5c25d5faa90b387473e820e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <gpadgett at redhat.com>


More information about the vdsm-patches mailing list