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

Proposed by Blake Rouse on 2014-10-23
Status: Merged
Approved by: Blake Rouse on 2014-10-23
Approved revision: 3293
Merged at revision: 3292
Proposed branch: lp:~blake-rouse/maas/fix-1384383
Merge into: lp:maas/trunk
Diff against target: 26 lines (+3/-0)
2 files modified
src/maasserver/api/boot_source_selections.py (+1/-0)
src/maasserver/api/tests/test_boot_source_selections.py (+2/-0)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1384383
Reviewer Review Type Date Requested Status
Christian Reis Approve on 2014-10-23
Graham Binns (community) 2014-10-23 Approve on 2014-10-23
Review via email: mp+239393@code.launchpad.net

Commit message

Show the os field in the boot source selections API.

To post a comment you must log in.
Graham Binns (gmb) :
review: Approve
Christian Reis (kiko) wrote :

+1 for 1.7 and trunk.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/api/boot_source_selections.py'
2--- src/maasserver/api/boot_source_selections.py 2014-09-04 14:51:02 +0000
3+++ src/maasserver/api/boot_source_selections.py 2014-10-23 15:28:24 +0000
4@@ -31,6 +31,7 @@
5
6 DISPLAYED_BOOTSOURCESELECTION_FIELDS = (
7 'id',
8+ 'os',
9 'release',
10 'arches',
11 'subarches',
12
13=== modified file 'src/maasserver/api/tests/test_boot_source_selections.py'
14--- src/maasserver/api/tests/test_boot_source_selections.py 2014-09-20 15:42:12 +0000
15+++ src/maasserver/api/tests/test_boot_source_selections.py 2014-10-23 15:28:24 +0000
16@@ -115,8 +115,10 @@
17 def test_PUT_updates_boot_source_selection(self):
18 self.become_admin()
19 boot_source_selection = factory.make_BootSourceSelection()
20+ new_os = factory.make_name('os')
21 new_release = factory.make_name('release')
22 new_values = {
23+ 'os': new_os,
24 'release': new_release,
25 'arches': [factory.make_name('arch'), factory.make_name('arch')],
26 'subarches': [