1
=== modified file 'src/maasserver/api/tests/test_pxeconfig.py'
2
--- src/maasserver/api/tests/test_pxeconfig.py	2015-10-23 17:53:22 +0000
3
+++ src/maasserver/api/tests/test_pxeconfig.py	2016-04-21 16:06:20 +0000
4
@@ -617,7 +617,7 @@
5
617
617
6
618
    def test_pxeconfig_returns_commissioning_os_series_for_other_oses(self):
618
    def test_pxeconfig_returns_commissioning_os_series_for_other_oses(self):
7
619
        osystem = Config.objects.get_config('default_osystem')
619
        osystem = Config.objects.get_config('default_osystem')
9
620
        release = Config.objects.get_config('default_distro_series')
620
        release = Config.objects.get_config('commissioning_distro_series')
10
621
        nodegroup = factory.make_NodeGroup()
621
        nodegroup = factory.make_NodeGroup()
11
622
        os_image = make_rpc_boot_image(purpose='xinstall')
622
        os_image = make_rpc_boot_image(purpose='xinstall')
12
623
        architecture = '%s/%s' % (
623
        architecture = '%s/%s' % (
13
624
624
14
=== modified file 'src/provisioningserver/drivers/osystem/tests/test_ubuntu.py'
15
--- src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2015-09-10 19:19:24 +0000
16
+++ src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2016-04-21 16:06:20 +0000
17
@@ -36,6 +36,13 @@
18
36
                return info._format("fullname", row)
36
                return info._format("fullname", row)
19
37
        return None
37
        return None
20
38
38
21
39
    def get_supported_lts_releases(self):
22
40
        info = UbuntuDistroInfo()
23
41
        unsupported_releases = ['precise', 'xenial']
24
42
        return [name for name in info.supported()
25
43
                if name not in unsupported_releases
26
44
                if info.is_lts(name)]
27
45
28
39
    def test_get_boot_image_purposes(self):
46
    def test_get_boot_image_purposes(self):
29
40
        osystem = UbuntuOS()
47
        osystem = UbuntuOS()
30
41
        archs = [factory.make_name('arch') for _ in range(2)]
48
        archs = [factory.make_name('arch') for _ in range(2)]
31
@@ -63,12 +70,12 @@
32
63
        osystem = UbuntuOS()
70
        osystem = UbuntuOS()
33
64
        expected = osystem.get_supported_commissioning_releases()
71
        expected = osystem.get_supported_commissioning_releases()
34
65
        self.assertIsInstance(expected, list)
72
        self.assertIsInstance(expected, list)
36
66
        self.assertEqual(expected, [self.get_lts_release()])
73
        self.assertEqual(expected, self.get_supported_lts_releases())
37
67
74
38
68
    def test_default_commissioning_release(self):
75
    def test_default_commissioning_release(self):
39
69
        osystem = UbuntuOS()
76
        osystem = UbuntuOS()
40
70
        expected = osystem.get_default_commissioning_release()
77
        expected = osystem.get_default_commissioning_release()
42
71
        self.assertEqual(expected, self.get_lts_release())
78
        self.assertEqual(expected, 'trusty')
43
72
79
44
73
    def test_get_release_title(self):
80
    def test_get_release_title(self):
45
74
        osystem = UbuntuOS()
81
        osystem = UbuntuOS()
46
75
82
47
=== modified file 'src/provisioningserver/drivers/osystem/ubuntu.py'
48
--- src/provisioningserver/drivers/osystem/ubuntu.py	2015-09-24 16:22:12 +0000
49
+++ src/provisioningserver/drivers/osystem/ubuntu.py	2016-04-21 16:06:20 +0000
50
@@ -57,14 +57,18 @@
51
57
        only exists on Ubuntu, because that is the only operating
57
        only exists on Ubuntu, because that is the only operating
52
58
        system that supports commissioning.
58
        system that supports commissioning.
53
59
        """
59
        """
55
60
        return [self.get_lts_release()]
60
        info = UbuntuDistroInfo()
56
61
        unsupported_releases = ['precise', 'xenial']
57
62
        return [name for name in info.supported()
58
63
                if name not in unsupported_releases
59
64
                if info.is_lts(name)]
60
61
65
61
62
    def get_default_commissioning_release(self):
66
    def get_default_commissioning_release(self):
62
63
        """Gets the default commissioning release for Ubuntu. This only exists
67
        """Gets the default commissioning release for Ubuntu. This only exists
63
64
        on Ubuntu, because that is the only operating system that supports
68
        on Ubuntu, because that is the only operating system that supports
64
65
        commissioning.
69
        commissioning.
65
66
        """
70
        """
67
67
        return self.get_lts_release()
71
        return 'trusty'
68
68
72
69
69
    def get_distro_series_info_row(self, release):
73
    def get_distro_series_info_row(self, release):
70
70
        """Returns the distro series row information from python-distro-info.
74
        """Returns the distro series row information from python-distro-info.
Reviewer	Date Requested	Status
Andres Rodriguez (community)		Approve on 2016-04-21
Blake Rouse (community)	2016-04-21	Approve on 2016-04-21
Review via email: mp+292528@code.launchpad.net