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

[Blake Rouse]

Show the os field in the boot source selections API.

[Graham Binns (gmb)]

review: Approve

[Christian Reis (kiko)]

+1 for 1.7 and trunk.

review: Approve

=== modified file 'src/maasserver/api/boot_source_selections.py'
--- src/maasserver/api/boot_source_selections.py	2014-09-04 14:51:02 +0000
+++ src/maasserver/api/boot_source_selections.py	2014-10-23 15:28:24 +0000
@@ -31,6 +31,7 @@
 
 DISPLAYED_BOOTSOURCESELECTION_FIELDS = (
     'id',
+    'os',
     'release',
     'arches',
     'subarches',

=== modified file 'src/maasserver/api/tests/test_boot_source_selections.py'
--- src/maasserver/api/tests/test_boot_source_selections.py	2014-09-20 15:42:12 +0000
+++ src/maasserver/api/tests/test_boot_source_selections.py	2014-10-23 15:28:24 +0000
@@ -115,8 +115,10 @@
     def test_PUT_updates_boot_source_selection(self):
         self.become_admin()
         boot_source_selection = factory.make_BootSourceSelection()
+        new_os = factory.make_name('os')
         new_release = factory.make_name('release')
         new_values = {
+            'os': new_os,
             'release': new_release,
             'arches': [factory.make_name('arch'), factory.make_name('arch')],
             'subarches': [