Merge ~ltrager/maas:lp1822173 into maas:master

[Lee Trager]

LP: #1822173 - Set osystem and distro series to default when none given over the websocket.

[Alberto Donato (ack)]

LGTM, +1

review: Approve

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1822173 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5510/consoleText

[Andres Rodriguez (andreserl)]

======================================================================
ERROR: maasserver.tests.test_node_action.TestDeployAction.test_Deploy_starts_node
----------------------------------------------------------------------
Traceback (most recent call last):
testtools.testresult.real._StringException: Empty attachments:
  Twisted logs

Traceback (most recent call last):
  File "/run/build/maas/src/maasserver/node_action.py", line 490, in _execute
    self.node.distro_series)
  File "/run/build/maas/src/maasserver/utils/osystems.py", line 565, in validate_hwe_kernel
    raise ValidationError('%s has no kernels available.' % distro_series)
django.core.exceptions.ValidationError: ['bionic has no kernels available.']

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/run/build/maas/src/maastesting/runtest.py", line 138, in _run_user
    result = function(*args, **kwargs)
  File "/home/ubuntu/.buildout/eggs/testtools-2.2.0-py3.6.egg/testtools/testcase.py", line 719, in _run_test_method
    return self._get_test_method()()
  File "/run/build/maas/src/maasserver/tests/test_node_action.py", line 602, in test_Deploy_starts_node
    Deploy(node, user, request).execute()
  File "/run/build/maas/src/maasserver/node_action.py", line 172, in execute
    self._execute(*args, **kwargs)
  File "/run/build/maas/src/maasserver/node_action.py", line 493, in _execute
    raise NodeActionError(e)
maasserver.exceptions.NodeActionError: bionic has no kernels available.
======================================================================
ERROR: maasserver.tests.test_node_action.TestDeployAction.test_Deploy_allocates_node_if_node_not_already_allocated
----------------------------------------------------------------------
Traceback (most recent call last):
testtools.testresult.real._StringException: Empty attachments:
  Twisted logs

Traceback (most recent call last):
  File "/run/build/maas/src/maasserver/node_action.py", line 490, in _execute
    self.node.distro_series)
  File "/run/build/maas/src/maasserver/utils/osystems.py", line 565, in validate_hwe_kernel
    raise ValidationError('%s has no kernels available.' % distro_series)
django.core.exceptions.ValidationError: ['bionic has no kernels available.']

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/run/build/maas/src/maastesting/runtest.py", line 138, in _run_user
    result = function(*args, **kwargs)
  File "/home/ubuntu/.buildout/eggs/testtools-2.2.0-py3.6.egg/testtools/testcase.py", line 719, in _run_test_method
    return self._get_test_method()()
  File "/run/build/maas/src/maasserver/tests/test_node_action.py", line 836, in test_Deploy_allocates_node_if_node_not_already_allocated
    action.execute()
  File "/run/build/maas/src/maasserver/node_action.py", line 172, in execute
    self._execute(*args, **kwargs)
  File "/run/build/maas/src/maasserver/node_action.py", line 493, in _execute
    raise NodeActionError(e)
maasserver.exceptions.NodeActionError: bionic has no kernels available.

-------------------- >> begin captured logging << --------------------
maas.node: info: ...

review: Needs Fixing

[MAAS Lander (maas-lander)]

LANDING
-b lp1822173 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5511/consoleText

5cf138a... by Lee Trager on 2019-04-18

Fix broken tests

diff --git a/src/maasserver/node_action.py b/src/maasserver/node_action.py
index 5402ea2..e969138 100644
--- a/src/maasserver/node_action.py
+++ b/src/maasserver/node_action.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Node actions.
@@ -44,6 +44,7 @@ from maasserver.exceptions import (
     StaticIPAddressExhaustion,
 )
 from maasserver.models import (
+    Config,
     ResourcePool,
     Tag,
     Zone,
@@ -476,6 +477,12 @@ class Deploy(NodeAction):
                 self.node.save()
             except ValidationError as e:
                 raise NodeActionError(e)
+        else:
+            configs = Config.objects.get_configs(
+                ['default_osystem', 'default_distro_series'])
+            self.node.osystem = configs['default_osystem']
+            self.node.distro_series = configs['default_distro_series']
+            self.node.save()
         try:
             self.node.hwe_kernel = validate_hwe_kernel(
                 hwe_kernel, self.node.min_hwe_kernel,
diff --git a/src/maasserver/tests/test_node_action.py b/src/maasserver/tests/test_node_action.py
index 56ace53..8365260 100644
--- a/src/maasserver/tests/test_node_action.py
+++ b/src/maasserver/tests/test_node_action.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for node actions."""
@@ -26,6 +26,7 @@ from maasserver.enum import (
 )
 from maasserver.exceptions import NodeActionError
 from maasserver.models import (
+    Config,
     Event,
     signals,
     StaticIPAddress,
@@ -65,10 +66,7 @@ from maasserver.node_status import (
 )
 from maasserver.permissions import NodePermission
 from maasserver.testing.factory import factory
-from maasserver.testing.osystems import (
-    make_osystem_with_releases,
-    make_usable_osystem,
-)
+from maasserver.testing.osystems import make_usable_osystem
 from maasserver.testing.testcase import (
     MAASServerTestCase,
     MAASTransactionServerTestCase,
@@ -598,6 +596,11 @@ class TestDeployAction(MAASServerTestCase):
         mock_get_curtin_config = self.patch(
             node_action_module, 'get_curtin_config')
         mock_node_start = self.patch(node, 'start')
+        osystem = make_usable_osystem(self)
+        os_name = osystem["name"]
+        release_name = osystem["releases"][0]["name"]
+        Config.objects.set_config('default_osystem', os_name)
+        Config.objects.set_config('default_distro_series', release_name)
         Deploy(node, user, request).execute()
         self.expectThat(
             mock_get_curtin_config, MockCalledOnceWith(ANY, node))
@@ -617,6 +620,11 @@ class TestDeployAction(MAASServerTestCase):
         mock_get_curtin_config = self.patch(
             node_action_module, 'get_curtin_config')
         mock_get_curtin_config.side_effect = NodeActionError('error')
+        osystem = make_usable_osystem(self)
+        os_name = osystem["name"]
+        release_name = osystem["releases"][0]["name"]
+        Config.objects.set_config('default_osystem', os_name)
+        Config.objects.set_config('default_distro_series', release_name)
         error = self.assertRaises(
             NodeActionError, Deploy(node, user, request).execute)
         self.assertEqual(
@@ -668,6 +676,31 @@ class TestDeployAction(MAASServerTestCase):
         self.expectThat(
             node.distro_series, Equals(release_name))
 
+    def test_Deploy_sets_osystem_and_series_to_default(self):
+        # Regression test for LP:1822173
+        user = factory.make_User()
+        request = factory.make_fake_request('/')
+        request.user = user
+        node = factory.make_Node(
+            interface=True, status=NODE_STATUS.ALLOCATED,
+            power_type='manual', owner=user)
+        mock_get_curtin_config = self.patch(
+            node_action_module, 'get_curtin_config')
+        mock_node_start = self.patch(node, 'start')
+        osystem = make_usable_osystem(self)
+        os_name = osystem["name"]
+        release_name = osystem["releases"][0]["name"]
+        Config.objects.set_config('default_osystem', os_name)
+        Config.objects.set_config('default_distro_series', release_name)
+        Deploy(node, user, request).execute()
+        self.expectThat(
+            mock_get_curtin_config, MockCalledOnceWith(ANY, node))
+        self.expectThat(
+            mock_node_start, MockCalledOnceWith(user))
+        self.expectThat(node.osystem, Equals(os_name))
+        self.expectThat(
+            node.distro_series, Equals(release_name))
+
     def test_Deploy_sets_install_kvm_and_osystem_series_if_specified(self):
         user = factory.make_admin()
         request = factory.make_fake_request('/')
@@ -754,50 +787,6 @@ class TestDeployAction(MAASServerTestCase):
         self.expectThat(
             node.distro_series, Equals(release_name))
 
-    def test_Deploy_doesnt_set_osystem_and_series_if_os_missing(self):
-        user = factory.make_User()
-        request = factory.make_fake_request('/')
-        request.user = user
-        node = factory.make_Node(
-            interface=True, status=NODE_STATUS.ALLOCATED,
-            power_type='manual', owner=user)
-        mock_get_curtin_config = self.patch(
-            node_action_module, 'get_curtin_config')
-        mock_node_start = self.patch(node, 'start')
-        osystem = make_osystem_with_releases(self)
-        extra = {
-            "distro_series": osystem["releases"][0]["name"],
-        }
-        Deploy(node, user, request).execute(**extra)
-        self.expectThat(
-            mock_get_curtin_config, MockCalledOnceWith(ANY, node))
-        self.expectThat(
-            mock_node_start, MockCalledOnceWith(user))
-        self.expectThat(node.osystem, Equals(""))
-        self.expectThat(node.distro_series, Equals(""))
-
-    def test_Deploy_doesnt_set_osystem_and_series_if_series_missing(self):
-        user = factory.make_User()
-        request = factory.make_fake_request('/')
-        request.user = user
-        node = factory.make_Node(
-            interface=True, status=NODE_STATUS.ALLOCATED,
-            power_type='manual', owner=user)
-        mock_get_curtin_config = self.patch(
-            node_action_module, 'get_curtin_config')
-        mock_node_start = self.patch(node, 'start')
-        osystem = make_osystem_with_releases(self)
-        extra = {
-            "osystem": osystem["name"],
-        }
-        Deploy(node, user, request).execute(**extra)
-        self.expectThat(
-            mock_get_curtin_config, MockCalledOnceWith(ANY, node))
-        self.expectThat(
-            mock_node_start, MockCalledOnceWith(user))
-        self.expectThat(node.osystem, Equals(""))
-        self.expectThat(node.distro_series, Equals(""))
-
     def test_Deploy_allocates_node_if_node_not_already_allocated(self):
         user = factory.make_User()
         request = factory.make_fake_request('/')
@@ -806,6 +795,11 @@ class TestDeployAction(MAASServerTestCase):
         mock_get_curtin_config = self.patch(
             node_action_module, 'get_curtin_config')
         mock_node_start = self.patch(node, 'start')
+        osystem = make_usable_osystem(self)
+        os_name = osystem["name"]
+        release_name = osystem["releases"][0]["name"]
+        Config.objects.set_config('default_osystem', os_name)
+        Config.objects.set_config('default_distro_series', release_name)
         action = Deploy(node, user, request)
         action.execute()