Merge lp:~blake-rouse/maas/fix-1522225 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix missing uuid on 181 migration.

[Mike Pontillo (mpontillo)]

Re-tested by downloading the patch to /root/patch and executing:

cat /root/patch | patch -p1 -d /usr/lib/python2.7/dist-packages

Looks better now. Thanks for the fix.

review: Approve

=== modified file 'src/maasserver/models/migrations/create_default_storage_layout.py'
--- src/maasserver/models/migrations/create_default_storage_layout.py	2015-12-01 21:37:21 +0000
+++ src/maasserver/models/migrations/create_default_storage_layout.py	2015-12-03 01:59:48 +0000
@@ -31,6 +31,7 @@
 ]
 
 from datetime import datetime
+from uuid import uuid4
 
 from maasserver.enum import (
     FILESYSTEM_GROUP_TYPE,
@@ -90,7 +91,7 @@
     total_size += partition_size
     root_partition = Partition.objects.create(
         partition_table=partition_table, size=partition_size, bootable=True,
-        created=now, updated=now)
+        created=now, updated=now, uuid=uuid4())
 
     # Add the extra partitions if there is more space.
     partitions = [root_partition]
@@ -102,27 +103,28 @@
         partitions.append(
             Partition.objects.create(
                 partition_table=partition_table, size=size, bootable=False,
-                created=now, updated=now))
+                created=now, updated=now, uuid=uuid4()))
         available_size -= size
         total_size += size
 
     # Create the volume group and logical volume.
     volume_group = FilesystemGroup.objects.create(
         name="vgroot", group_type=FILESYSTEM_GROUP_TYPE.LVM_VG,
-        created=now, updated=now)
+        created=now, updated=now, uuid=uuid4())
     for partition in partitions:
         Filesystem.objects.create(
-            fstype=FILESYSTEM_TYPE.LVM_PV, partition=partition,
+            fstype=FILESYSTEM_TYPE.LVM_PV, partition=partition, uuid=uuid4(),
             filesystem_group=volume_group, created=now, updated=now)
     number_of_extents, _ = divmod(total_size, LVM_PE_SIZE)
     lv_size = (number_of_extents - len(partitions)) * LVM_PE_SIZE
     logical_volume = VirtualBlockDevice.objects.create(
         node=node, name="lvroot", size=lv_size, block_size=4096,
-        filesystem_group=volume_group, created=now, updated=now)
+        filesystem_group=volume_group, created=now, updated=now, uuid=uuid4())
     Filesystem.objects.create(
         block_device=logical_volume,
         fstype=FILESYSTEM_TYPE.EXT4,
         label="root",
         mount_point="/",
         created=now,
-        updated=now)
+        updated=now,
+        uuid=uuid4())