MAAS

Merge lp:~newell-jensen/maas/add-dtb-bootresource-file-type into lp:~maas-committers/maas/trunk

  1. add-dtb-bootresource-file-type
  2. Merge into trunk
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 3500
Proposed branch: lp:~newell-jensen/maas/add-dtb-bootresource-file-type
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 31 lines (+8/-0)
1 file modified
src/maasserver/enum.py (+8/-0)
To merge this branch: bzr merge lp:~newell-jensen/maas/add-dtb-bootresource-file-type
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+246238@code.launchpad.net

Commit message

This branch adds a new DTB file type to BOOT_RESOURCE_FILE_TYPE so the region can handle importing DTB files for the sub-architectures that need them.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve
Revision history for this message
Blake Rouse (blake-rouse) :
review: Needs Fixing
Revision history for this message
Blake Rouse (blake-rouse) wrote :

You also should not make those changes to the unit tests as they are not needed and not provide anything more.

Revision history for this message
Newell Jensen (newell-jensen) wrote :

Ready for another review.

Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good, even simpler than expected!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/enum.py'
2--- src/maasserver/enum.py 2014-10-30 06:16:25 +0000
3+++ src/maasserver/enum.py 2015-01-23 19:49:19 +0000
4@@ -292,12 +292,18 @@
5 #: Boot Initrd (ISCSI initrd)
6 BOOT_INITRD = 'boot-initrd'
7
8+ #: Boot DTB (ISCSI dtb)
9+ BOOT_DTB = 'boot-dtb'
10+
11 #: DI Kernel (Debian Installer kernel)
12 DI_KERNEL = 'di-kernel'
13
14 #: DI Initrd (Debian Installer initrd)
15 DI_INITRD = 'di-initrd'
16
17+ #: DI DTB (Debian Installer dtb)
18+ DI_DTB = 'di-dtb'
19+
20
21 # Django choices for BOOT_RESOURCE_FILE_TYPE: sequence of tuples (key, UI
22 # representation).
23@@ -307,6 +313,8 @@
24 (BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE, "Compressed Root Image"),
25 (BOOT_RESOURCE_FILE_TYPE.BOOT_KERNEL, "Linux ISCSI Kernel"),
26 (BOOT_RESOURCE_FILE_TYPE.BOOT_INITRD, "Initial ISCSI Ramdisk"),
27+ (BOOT_RESOURCE_FILE_TYPE.BOOT_DTB, "ISCSI Device Tree Blob"),
28 (BOOT_RESOURCE_FILE_TYPE.DI_KERNEL, "Linux DI Kernel"),
29 (BOOT_RESOURCE_FILE_TYPE.DI_INITRD, "Initial DI Ramdisk"),
30+ (BOOT_RESOURCE_FILE_TYPE.DI_DTB, "DI Device Tree Blob"),
31 )