Merge lp:~rvb/maas-test/only-trusty into lp:maas-test

[Raphaël Badin]

Limit the list of series on which to install MAAS to Trusty.

maas-test can only install MAAS on Trusty now. This is a consequence of the way bug 1301815 was fixed (see https://code.launchpad.net/~jtv/maas-test/no-import-ephemerals/+merge/213958).

Right now the parameter is a bit useless (the default is the only valid value for --maas-series) but I decided to keep the parameter as it will be useful in the future.

[Julian Edwards (julian-edwards)]

Thanks for making this change. I think it's fine, but I do have a query in [2].

[1]

11 + default=utils.get_supported_maas_series()[0],

Unexplained indexes like this are a red flag. I think it would be better to just hard-code "trusty" here.

[2]

71 + These are the series that MAAS can deploy on the nodes
72 + it manages.
73 + """
74 + return _get_supported_series('precise')

Why is trusty not included here?

review: Needs Information

[Julian Edwards (julian-edwards)]

Oh as soon as I press the damn button I see why... the structure of the code confused me a bit so I'll approve now with a suggestion:

74 + return _get_supported_series('precise')

83 + return _get_supported_series('trusty')

Please add a comment above both of these that says "Return all series above and including .... XXX"

Thank you :)

review: Approve

[lp:~rvb/maas-test/only-trusty]

147. By Raphaël Badin on 2014-04-08

Add comments.

=== modified file 'maastest/parser.py'
--- maastest/parser.py	2014-03-21 16:21:22 +0000
+++ maastest/parser.py	2014-04-08 06:49:33 +0000
@@ -108,8 +108,8 @@
     # VM details.
     parser.add_argument(
         '--maas-series', type=text_type,
-        choices=utils.get_supported_series(),
-        default=latest_released_series,
+        choices=utils.get_supported_maas_series(),
+        default=utils.get_supported_maas_series()[0],
         help="Code name for the Ubuntu release series to install on the "
              "virtual machine (where the MAAS server will be installed).  "
              "Defaults to the latest stable Ubuntu series (%(default)s).")
@@ -126,7 +126,7 @@
     # MAAS images.
     parser.add_argument(
         '--series', type=text_type,
-        choices=utils.get_supported_series(),
+        choices=utils.get_supported_node_series(),
         default=latest_LTS_series,
         help="Code name for the Ubuntu release series that the node should "
              "run.  Defaults to the latest LTS (%(default)s).")

=== modified file 'maastest/tests/test_utils.py'
--- maastest/tests/test_utils.py	2014-03-03 04:27:57 +0000
+++ maastest/tests/test_utils.py	2014-04-08 06:49:33 +0000
@@ -251,9 +251,9 @@
         self.assertEqual(series, utils.determine_vm_series())
 
 
-class TestGetSupportedSeries(testtools.TestCase):
+class TestGetSupportedNodeSeries(testtools.TestCase):
 
-    def test_get_supported_series_return_series(self):
+    def test_get_supported_node_series_return_series(self):
         supported = (
             distro_info.UbuntuDistroInfo().supported(result="codename"))
         # The list of supported series will evolve in time.  At the time
@@ -261,9 +261,15 @@
         # not supported by MAAS.
         if 'lucid' in supported:
             supported.remove('lucid')
-            self.assertEqual(supported, utils.get_supported_series())
+            self.assertEqual(supported, utils.get_supported_node_series())
         else:
-            self.assertEqual(supported, utils.get_supported_series())
+            self.assertEqual(supported, utils.get_supported_node_series())
+
+
+class TestGetSupportedMAASSeries(testtools.TestCase):
+
+    def test_get_supported_maas_series_return_series(self):
+        self.assertEqual(['trusty'], utils.get_supported_maas_series())
 
 
 class TestExtractMAPIPMapping(testtools.TestCase):

=== modified file 'maastest/utils.py'
--- maastest/utils.py	2014-03-03 04:27:57 +0000
+++ maastest/utils.py	2014-04-08 06:49:33 +0000
@@ -159,12 +159,34 @@
     return series
 
 
-def get_supported_series():
-    """List of MAAS-supported Ubuntu series."""
+def get_supported_node_series():
+    """List of MAAS-supported Ubuntu series.
+
+    These are the series that MAAS can deploy on the nodes
+    it manages.
+    """
+    # Return all series above and including Precise.
+    return _get_supported_series('precise')
+
+
+def get_supported_maas_series():
+    """List of Ubuntu series for MAAS.
+
+    These are the series on which maas-test can install a
+    a MAAS instance.
+    """
+    # Return all series above and including Trusty.
+    return _get_supported_series('trusty')
+
+
+def _get_supported_series(cut_off_series):
+    """Return the list of supported series, starting from the given
+    `cut_off_series`.
+    """
     udi = distro_info.UbuntuDistroInfo()
     supported = udi.supported(result="codename")
     cut_off_index = (
-        supported.index('precise') if 'precise' in supported else 0)
+        supported.index(cut_off_series) if cut_off_series in supported else 0)
     return supported[cut_off_index:]