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

[Blake Rouse]

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

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2014-03-28 16:36:32 +0000
+++ src/maasserver/enum.py	2014-07-18 15:35:29 +0000
@@ -93,21 +93,19 @@
     #:
     precise = 'precise'
     #:
-    quantal = 'quantal'
-    #:
-    raring = 'raring'
-    #:
     saucy = 'saucy'
     #:
     trusty = 'trusty'
+    #:
+    utopic = 'utopic'
+
 
 DISTRO_SERIES_CHOICES = (
     (DISTRO_SERIES.default, 'Default Ubuntu Release'),
     (DISTRO_SERIES.precise, 'Ubuntu 12.04 LTS "Precise Pangolin"'),
-    (DISTRO_SERIES.quantal, 'Ubuntu 12.10 "Quantal Quetzal"'),
-    (DISTRO_SERIES.raring, 'Ubuntu 13.04 "Raring Ringtail"'),
     (DISTRO_SERIES.saucy, 'Ubuntu 13.10 "Saucy Salamander"'),
     (DISTRO_SERIES.trusty, 'Ubuntu 14.04 LTS "Trusty Tahr"'),
+    (DISTRO_SERIES.utopic, 'Ubuntu 14.10 "Utopic Unicorn"'),
 )
 
 
 
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2014-05-07 02:53:23 +0000
+++ src/maasserver/models/tests/test_node.py	2014-07-18 15:35:29 +0000
@@ -162,7 +162,7 @@
 
     def test_set_get_distro_series_returns_series(self):
         node = factory.make_node()
-        series = DISTRO_SERIES.quantal
+        series = DISTRO_SERIES.utopic
         node.set_distro_series(series)
         self.assertEqual(series, node.get_distro_series())
 
@@ -474,7 +474,7 @@
     def test_release_clears_distro_series(self):
         node = factory.make_node(
             status=NODE_STATUS.ALLOCATED, owner=factory.make_user())
-        node.set_distro_series(series=DISTRO_SERIES.quantal)
+        node.set_distro_series(series=DISTRO_SERIES.utopic)
         node.release()
         self.assertEqual("", node.distro_series)