Merge lp:~blake-rouse/maas/add-utopic-1.5 into lp:maas/1.5

Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 2291
Proposed branch: lp:~blake-rouse/maas/add-utopic-1.5
Merge into: lp:maas/1.5
Diff against target: 50 lines (+6/-8)
2 files modified
src/maasserver/enum.py (+4/-6)
src/maasserver/models/tests/test_node.py (+2/-2)
To merge this branch: bzr merge lp:~blake-rouse/maas/add-utopic-1.5
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+227347@code.launchpad.net

Commit message

Add 14.10 Utopic Unicorn to available distro series. Remove quantal and raring as support period has ended.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) :
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-03-28 16:36:32 +0000
3+++ src/maasserver/enum.py 2014-07-18 15:35:29 +0000
4@@ -93,21 +93,19 @@
5 #:
6 precise = 'precise'
7 #:
8- quantal = 'quantal'
9- #:
10- raring = 'raring'
11- #:
12 saucy = 'saucy'
13 #:
14 trusty = 'trusty'
15+ #:
16+ utopic = 'utopic'
17+
18
19 DISTRO_SERIES_CHOICES = (
20 (DISTRO_SERIES.default, 'Default Ubuntu Release'),
21 (DISTRO_SERIES.precise, 'Ubuntu 12.04 LTS "Precise Pangolin"'),
22- (DISTRO_SERIES.quantal, 'Ubuntu 12.10 "Quantal Quetzal"'),
23- (DISTRO_SERIES.raring, 'Ubuntu 13.04 "Raring Ringtail"'),
24 (DISTRO_SERIES.saucy, 'Ubuntu 13.10 "Saucy Salamander"'),
25 (DISTRO_SERIES.trusty, 'Ubuntu 14.04 LTS "Trusty Tahr"'),
26+ (DISTRO_SERIES.utopic, 'Ubuntu 14.10 "Utopic Unicorn"'),
27 )
28
29
30
31=== modified file 'src/maasserver/models/tests/test_node.py'
32--- src/maasserver/models/tests/test_node.py 2014-05-07 02:53:23 +0000
33+++ src/maasserver/models/tests/test_node.py 2014-07-18 15:35:29 +0000
34@@ -162,7 +162,7 @@
35
36 def test_set_get_distro_series_returns_series(self):
37 node = factory.make_node()
38- series = DISTRO_SERIES.quantal
39+ series = DISTRO_SERIES.utopic
40 node.set_distro_series(series)
41 self.assertEqual(series, node.get_distro_series())
42
43@@ -474,7 +474,7 @@
44 def test_release_clears_distro_series(self):
45 node = factory.make_node(
46 status=NODE_STATUS.ALLOCATED, owner=factory.make_user())
47- node.set_distro_series(series=DISTRO_SERIES.quantal)
48+ node.set_distro_series(series=DISTRO_SERIES.utopic)
49 node.release()
50 self.assertEqual("", node.distro_series)
51

Subscribers

People subscribed via source and target branches

to all changes: