Merge lp:~blake-rouse/maas/fix-startup-and-list-archs into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix start_up to use BootResource instead of BootImage. Fix list_all_usable_architectures to use BootResource instead of BootImage.

[Gavin Panella (allenap)]

Looks good. Just a couple of comments on wording.

review: Approve

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2014-09-01 12:18:51 +0000
+++ src/maasserver/forms.py	2014-09-02 13:12:22 +0000
@@ -98,7 +98,6 @@
     list_commisioning_choices,
     )
 from maasserver.models import (
-    BootImage,
     BootResource,
     BootResourceFile,
     BootResourceSet,
@@ -212,19 +211,11 @@
 def list_all_usable_architectures():
     """Return all architectures that can be used for nodes.
 
-    These are the architectures for which any nodegroup has the boot images
-    required to commission and install nodes.
+    These are the architectures for which any boot resource exists. Now that
+    all clusters sync from the region, all cluster support the same
+    architectures.
     """
-    # The Node edit form offers all usable architectures as options for the
-    # architecture field.  Not all of these may be available in the node's
-    # nodegroup, but to represent that accurately in the UI would depend on
-    # the currently selected nodegroup.  Narrowing the options down further
-    # would have to happen browser-side.
-    architectures = set()
-    for nodegroup in NodeGroup.objects.all():
-        architectures = architectures.union(
-            BootImage.objects.get_usable_architectures(nodegroup))
-    return sorted(architectures)
+    return sorted(BootResource.objects.get_usable_architectures())
 
 
 def list_architecture_choices(architectures):

=== modified file 'src/maasserver/start_up.py'
--- src/maasserver/start_up.py	2014-08-29 20:14:16 +0000
+++ src/maasserver/start_up.py	2014-09-02 13:12:22 +0000
@@ -35,7 +35,7 @@
 from maasserver.enum import COMPONENT
 from maasserver.fields import register_mac_type
 from maasserver.models import (
-    BootImage,
+    BootResource,
     NodeGroup,
     )
 from provisioningserver.upgrade_cluster import create_gnupg_home
@@ -65,17 +65,14 @@
     post_start_up()
 
 
-def update_import_script_error():
+def update_boot_resource_error():
     import_script = COMPONENT.IMPORT_PXE_FILES
-    have_boot_images = BootImage.objects.all().exists()
-    if not have_boot_images and get_persistent_error(import_script) is None:
+    have_resources = BootResource.objects.all().exists()
+    if not have_resources and get_persistent_error(import_script) is None:
         warning = dedent("""\
-            The region controller does not know whether any boot images have
-            been imported yet.  If this message does not disappear in 5
-            minutes, there may be a communication problem between the region
-            worker process and the region controller.  Check the region
-            worker's logs for signs that it was unable to report to the MAAS
-            API.
+            The region controller does not have any boot images available.
+            Nodes will not be able to provision without boot images. Start
+            the boot images import process to resolve this issue.
             """)
         register_persistent_error(import_script, warning)
 
@@ -101,7 +98,7 @@
     write_full_dns_config(reload_retry=True)
 
     # Check whether we have boot images yet.
-    update_import_script_error()
+    update_boot_resource_error()
 
 
 def post_start_up():

=== modified file 'src/maasserver/tests/test_forms_helpers.py'
--- src/maasserver/tests/test_forms_helpers.py	2014-08-26 08:07:48 +0000
+++ src/maasserver/tests/test_forms_helpers.py	2014-09-02 13:12:22 +0000
@@ -14,7 +14,10 @@
 __metaclass__ = type
 __all__ = []
 
-from maasserver.enum import NODE_STATUS
+from maasserver.enum import (
+    BOOT_RESOURCE_TYPE,
+    NODE_STATUS,
+    )
 from maasserver.forms import (
     AdminNodeForm,
     AdminNodeWithMACAddressesForm,
@@ -38,30 +41,22 @@
 
 class TestHelpers(MAASServerTestCase):
 
-    def make_usable_boot_images(self, nodegroup=None, osystem=None,
-                                arch=None, subarchitecture=None, release=None):
-        """Create a set of boot images, so the architecture becomes "usable".
+    def make_usable_boot_resource(self, arch=None, subarch=None):
+        """Create a set of boot resources, so the architecture becomes usable.
 
-        This will make the images' architecture show up in the list of usable
-        architecture.
+        This will make the resources' architecture show up in the list of
+        usable architecture.
 
         Nothing is returned.
         """
-        if nodegroup is None:
-            nodegroup = factory.make_node_group()
-        if osystem is None:
-            osystem = factory.make_name('os')
         if arch is None:
             arch = factory.make_name('arch')
-        if subarchitecture is None:
-            subarchitecture = factory.make_name('subarch')
-        if release is None:
-            release = factory.make_name('release')
+        if subarch is None:
+            subarch = factory.make_name('subarch')
         for purpose in ['install', 'commissioning']:
-            factory.make_boot_image(
-                nodegroup=nodegroup, osystem=osystem, architecture=arch,
-                subarchitecture=subarchitecture, release=release,
-                purpose=purpose)
+            architecture = '%s/%s' % (arch, subarch)
+            factory.make_usable_boot_resource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED, architecture=architecture)
 
     def test_initialize_node_group_leaves_nodegroup_reference_intact(self):
         preselected_nodegroup = factory.make_node_group()
@@ -88,7 +83,7 @@
             (factory.make_name('arch'), factory.make_name('subarch'))
             for _ in range(3)]
         for arch, subarch in arches:
-            self.make_usable_boot_images(arch=arch, subarchitecture=subarch)
+            self.make_usable_boot_resource(arch=arch, subarch=subarch)
         expected = [
             "%s/%s" % (arch, subarch) for arch, subarch in arches]
         self.assertItemsEqual(expected, list_all_usable_architectures())
@@ -98,7 +93,7 @@
             (factory.make_name('arch'), factory.make_name('subarch'))
             for _ in range(3)]
         for arch, subarch in arches:
-            self.make_usable_boot_images(arch=arch, subarchitecture=subarch)
+            self.make_usable_boot_resource(arch=arch, subarch=subarch)
         expected = [
             "%s/%s" % (arch, subarch) for arch, subarch in arches]
         self.assertEqual(sorted(expected), list_all_usable_architectures())
@@ -106,8 +101,8 @@
     def test_list_all_usable_architectures_returns_no_duplicates(self):
         arch = factory.make_name('arch')
         subarch = factory.make_name('subarch')
-        self.make_usable_boot_images(arch=arch, subarchitecture=subarch)
-        self.make_usable_boot_images(arch=arch, subarchitecture=subarch)
+        self.make_usable_boot_resource(arch=arch, subarch=subarch)
+        self.make_usable_boot_resource(arch=arch, subarch=subarch)
         self.assertEqual(
             ["%s/%s" % (arch, subarch)], list_all_usable_architectures())
 

=== modified file 'src/maasserver/tests/test_start_up.py'
--- src/maasserver/tests/test_start_up.py	2014-08-26 17:50:29 +0000
+++ src/maasserver/tests/test_start_up.py	2014-09-02 13:12:22 +0000
@@ -28,7 +28,6 @@
     NODEGROUP_STATUS,
     )
 from maasserver.models import (
-    BootImage,
     BootSource,
     NodeGroup,
     )
@@ -37,11 +36,20 @@
 from maasserver.testing.testcase import MAASServerTestCase
 from maastesting.celery import CeleryFixture
 from maastesting.fakemethod import FakeMethod
-from maastesting.matchers import MockCalledOnceWith
-from mock import Mock
+from maastesting.matchers import (
+    MockCalledOnceWith,
+    MockCalledWith,
+    )
+from mock import (
+    ANY,
+    Mock,
+    )
 from provisioningserver import tasks
 from testresources import FixtureResource
-from testtools.matchers import HasLength
+from testtools.matchers import (
+    HasLength,
+    Not,
+    )
 
 
 class LockChecker:
@@ -122,48 +130,41 @@
         start_up.inner_start_up()
         self.assertThat(BootSource.objects.all(), HasLength(1))
 
-    def test__warns_about_missing_boot_images(self):
-        # If no boot images have been registered yet, that may mean that
-        # the import script has not been successfully run yet, or that
-        # the master worker is having trouble reporting its images.  And
-        # so start_up registers a persistent warning about this.
-        BootImage.objects.all().delete()
+    def test__warns_about_missing_boot_resources(self):
+        # If no boot resources have been created, then the user has not
+        # performed the import process.
         discard_persistent_error(COMPONENT.IMPORT_PXE_FILES)
         recorder = self.patch(start_up, 'register_persistent_error')
 
         start_up.inner_start_up()
 
-        self.assertIn(
-            COMPONENT.IMPORT_PXE_FILES,
-            [args[0][0] for args in recorder.call_args_list])
+        self.assertThat(
+            recorder,
+            MockCalledWith(COMPONENT.IMPORT_PXE_FILES, ANY))
 
-    def test__does_not_warn_if_boot_images_are_known(self):
-        # If boot images are known, there is no warning about the import
-        # script.
-        factory.make_boot_image()
+    def test__does_not_warn_if_boot_resources_are_known(self):
+        # If boot resources are known, there is no warning.
+        factory.make_boot_resource()
         recorder = self.patch(start_up, 'register_persistent_error')
 
         start_up.inner_start_up()
 
-        self.assertNotIn(
-            COMPONENT.IMPORT_PXE_FILES,
-            [args[0][0] for args in recorder.call_args_list])
+        self.assertThat(
+            recorder,
+            Not(MockCalledWith(COMPONENT.IMPORT_PXE_FILES, ANY)))
 
     def test__does_not_warn_if_already_warning(self):
-        # If there already is a warning about missing boot images, it is
-        # based on more precise knowledge of whether we ever heard from
-        # the region worker at all.  It will not be replaced by a less
-        # knowledgeable warning.
-        BootImage.objects.all().delete()
+        # If there already is a warning about missing boot resources, it will
+        # not be replaced.
         register_persistent_error(
             COMPONENT.IMPORT_PXE_FILES, factory.make_string())
         recorder = self.patch(start_up, 'register_persistent_error')
 
         start_up.inner_start_up()
 
-        self.assertNotIn(
-            COMPONENT.IMPORT_PXE_FILES,
-            [args[0][0] for args in recorder.call_args_list])
+        self.assertThat(
+            recorder,
+            Not(MockCalledWith(COMPONENT.IMPORT_PXE_FILES, ANY)))
 
 
 class TestPostStartUp(MAASServerTestCase):