Merge lp:~nuclearbob/utah/bug1043419 into lp:utah

[Max Brustkern]

This branch should fix bug 1043419, which caused attempts to provision a VM with multiple disks to fail. I don't have an preseed capable of automating this provisioning yet, so that will need to be provided by test case authors wishing to utilize multiple disks, but this fixes the code issue.

[Joe Talbott (joetalbott)]

Looks okay to me.

Merge away!

review: Approve

[Javier Collado (javier.collado)]

I don't see what was the issue, but I believe that enumerate would be a more pythonic way to iterate over the indexes and sizes in the array:

for index, size in enumerate(disksizes):
    disksize = '{}G'.format(size)
    basename = 'disk{}.qcow2.format(index)

review: Needs Fixing

[Javier Collado (javier.collado)]

In the previous code, there is a quote missing:
'disk{}.qcow2'.format(index)

[lp:~nuclearbob/utah/bug1043419]

691. By Max Brustkern on 2012-10-04

Changed to use enumerate

692. By Max Brustkern on 2012-10-04

Fixed typo

[Max Brustkern (nuclearbob)]

Thanks, I didn't know about enumerate. I've added that, and tested VM creation with a few different disk combinations. Let me know if you've got any other thoughts, and if not, I'll merge.

review: Needs Resubmitting

[Javier Collado (javier.collado)]

Looks good to me now. Thanks.

review: Approve

=== modified file 'utah/provisioning/vm/libvirtvm.py'
--- utah/provisioning/vm/libvirtvm.py	2012-08-30 08:31:37 +0000
+++ utah/provisioning/vm/libvirtvm.py	2012-10-04 15:11:22 +0000
@@ -426,9 +426,9 @@
         if disksizes is None:
             disksizes = self.disksizes
         self.disks = []
-        for size in disksizes:
-            disksize = str(size) + 'G'
-            basename = 'disk' + str(disksizes.index(size)) + '.qcow2'
+        for index, size in enumerate(disksizes):
+            disksize = '{}G'.format(size)
+            basename = 'disk{}.qcow2'.format(index)
             diskfile = os.path.join(self.directory, basename)
             if not os.path.isfile(diskfile):
                 cmd = ['qemu-img', 'create', '-f', 'qcow2', diskfile, disksize]