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

[Blake Rouse]

Fix setting the default_distro_series over the API.

[Ricardo Bánffy (rbanffy)]

Looks OK. One typo and one naming suggestion.

review: Approve

[Blake Rouse (blake-rouse)]

Thanks for the review. Fixing the typo.

=== added file 'src/maasserver/api/tests/test_maas.py'
--- src/maasserver/api/tests/test_maas.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/api/tests/test_maas.py	2015-07-31 23:12:48 +0000
@@ -0,0 +1,75 @@
+# Copyright 2013-2015 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for maas endpoint in the API."""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+str = None
+
+__metaclass__ = type
+__all__ = []
+
+import httplib
+
+from django.core.urlresolvers import reverse
+from maasserver.models.config import Config
+from maasserver.testing.api import APITestCase
+from maasserver.testing.factory import factory
+from maasserver.testing.osystems import (
+    make_osystem_with_releases,
+    make_usable_osystem,
+    patch_usable_osystems,
+)
+
+
+class MAASHandlerAPITest(APITestCase):
+
+    def test_get_config_default_distro_series(self):
+        self.become_admin()
+        default_distro_series = factory.make_name("distro_series")
+        Config.objects.set_config(
+            "default_distro_series", default_distro_series)
+        response = self.client.get(
+            reverse('maas_handler'), {
+                "op": "get_config",
+                "name": "default_distro_series",
+            })
+        self.assertEquals(httplib.OK, response.status_code, response.content)
+        self.assertEquals('"%s"' % default_distro_series, response.content)
+
+    def test_set_config_default_distro_series(self):
+        self.become_admin()
+        osystem = make_usable_osystem(self)
+        Config.objects.set_config("default_osystem", osystem['name'])
+        selected_release = osystem['releases'][0]['name']
+        response = self.client.post(
+            reverse('maas_handler'), {
+                "op": "set_config",
+                "name": "default_distro_series",
+                "value": selected_release,
+            })
+        self.assertEquals(httplib.OK, response.status_code, response.content)
+        self.assertEquals(
+            selected_release,
+            Config.objects.get_config("default_distro_series"))
+
+    def test_set_config_only_default_osystem_are_valid_for_distro_series(self):
+        self.become_admin()
+        default_osystem = make_osystem_with_releases(self)
+        other_osystem = make_osystem_with_releases(self)
+        patch_usable_osystems(self, [default_osystem, other_osystem])
+        Config.objects.set_config("default_osystem", default_osystem['name'])
+        invalid_release = other_osystem['releases'][0]['name']
+        response = self.client.post(
+            reverse('maas_handler'), {
+                "op": "set_config",
+                "name": "default_distro_series",
+                "value": invalid_release,
+            })
+        self.assertEquals(
+            httplib.BAD_REQUEST, response.status_code, response.content)
 
=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2015-07-28 04:54:11 +0000
+++ src/maasserver/forms.py	2015-07-31 23:12:48 +0000
@@ -119,6 +119,7 @@
     CONFIG_ITEMS_KEYS,
     get_config_field,
     INVALID_SETTING_MSG_TEMPLATE,
+    validate_missing_boot_images,
 )
 from maasserver.models import (
     Bcache,
@@ -1389,10 +1390,31 @@
         # don't want _load_initial called until the field has been added.
         Form.__init__(self, *args, **kwargs)
         self.fields['default_osystem'] = get_config_field('default_osystem')
-        self.fields['default_distro_series'] = get_config_field(
-            'default_distro_series')
+        self.fields['default_distro_series'] = (
+            self._get_default_distro_series_field_for_ui())
         self._load_initials()
 
+    def _get_default_distro_series_field_for_ui(self):
+        """This create the field with os/release. This is needed by the UI
+        to filter the releases based on the OS selection. The API uses the
+        field defined in forms_settings.py"""
+        usable_oses = list_all_usable_osystems()
+        release_choices = list_release_choices(
+            list_all_usable_releases(usable_oses), include_default=False)
+        if len(release_choices) == 0:
+            release_choices = [('---', '--- No Usable Release ---')]
+        field = forms.ChoiceField(
+            initial=Config.objects.get_config('default_distro_series'),
+            choices=release_choices,
+            validators=[validate_missing_boot_images],
+            error_messages={
+                'invalid_choice': compose_invalid_choice_text(
+                    'release', release_choices)
+            },
+            label="Default OS release used for deployment",
+            required=False)
+        return field
+
     def _load_initials(self):
         super(DeployForm, self)._load_initials()
         initial_os = self.fields['default_osystem'].initial
 
=== modified file 'src/maasserver/forms_settings.py'
--- src/maasserver/forms_settings.py	2015-07-26 13:15:53 +0000
+++ src/maasserver/forms_settings.py	2015-07-31 23:12:48 +0000
@@ -39,7 +39,6 @@
     list_all_usable_releases,
     list_commissioning_choices,
     list_osystem_choices,
-    list_release_choices,
 )
 
 
@@ -74,13 +73,35 @@
     return field
 
 
+def get_default_usable_osystem(default_osystem):
+    """Return the osystem from the clusters that matches the default_osystem.
+    """
+    usable_oses = list_all_usable_osystems()
+    for usable_os in usable_oses:
+        if usable_os["name"] == default_osystem:
+            return usable_os
+    return None
+
+
+def list_choices_for_releases(releases):
+    """List all the release choices."""
+    return [
+        (release['name'], release['title'])
+        for release in releases
+    ]
+
+
 def make_default_distro_series_field(*args, **kwargs):
     """Build and return the default_distro_series field."""
-    usable_oses = list_all_usable_osystems()
-    release_choices = list_release_choices(
-        list_all_usable_releases(usable_oses), include_default=False)
-    if len(release_choices) == 0:
-        release_choices = [('---', '--- No Usable Release ---')]
+    default_osystem = Config.objects.get_config('default_osystem')
+    default_usable_os = get_default_usable_osystem(default_osystem)
+    release_choices = [('---', '--- No Usable Release ---')]
+    if default_usable_os is not None:
+        releases = list_all_usable_releases(
+            [default_usable_os])[default_osystem]
+        valid_release_choices = list_choices_for_releases(releases)
+        if len(valid_release_choices) > 0:
+            release_choices = valid_release_choices
     field = forms.ChoiceField(
         initial=Config.objects.get_config('default_distro_series'),
         choices=release_choices,