Merge lp:~jtv/maas/1.5-use-main-archive-for-intel-arches into lp:maas/1.5

[Jeroen T. Vermeulen]

Backport trunk r2278: Address one of several problems reported in bug 1310076: Curtin userdata should use the main archive for all i386/amd64 architectures, not just for the ‘generic’ ones. It was accidentally using the ports archive for HWE kernels.

[Jeroen T. Vermeulen (jtv)]

Straight backport. Self-approving.

review: Approve

=== modified file 'contrib/preseeds_v2/curtin_userdata'
--- contrib/preseeds_v2/curtin_userdata	2014-04-15 15:18:47 +0000
+++ contrib/preseeds_v2/curtin_userdata	2014-04-23 03:46:12 +0000
@@ -28,7 +28,7 @@
 power_state:
   mode: reboot
 
-{{if node.architecture in {'i386/generic', 'amd64/generic'} }}
+{{if node.split_arch()[0] in {'i386', 'amd64'} }}
 apt_mirrors:
   ubuntu_archive: http://{{main_archive_hostname}}/{{main_archive_directory}}
   ubuntu_security: http://{{main_archive_hostname}}/{{main_archive_directory}}
 
=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2014-04-07 14:05:35 +0000
+++ src/maasserver/models/node.py	2014-04-23 03:46:12 +0000
@@ -859,3 +859,8 @@
                 "expression. This expression must instead be updated to set "
                 "this node to install with the fast installer.")
         self.tags.add(uti_tag)
+
+    def split_arch(self):
+        """Return architecture and subarchitecture, as a tuple."""
+        arch, subarch = self.architecture.split('/')
+        return (arch, subarch)
 
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2014-04-07 14:05:35 +0000
+++ src/maasserver/models/tests/test_node.py	2014-04-23 03:46:12 +0000
@@ -755,6 +755,13 @@
             "The use-fastpath-installer tag is defined with an expression",
             unicode(error))
 
+    def test_split_arch_returns_arch_as_tuple(self):
+        main_arch = factory.make_name('arch')
+        sub_arch = factory.make_name('subarch')
+        full_arch = '%s/%s' % (main_arch, sub_arch)
+        node = factory.make_node(architecture=full_arch)
+        self.assertEqual((main_arch, sub_arch), node.split_arch())
+
 
 class NodeRoutersTest(MAASServerTestCase):
 
 
=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2014-04-10 14:02:21 +0000
+++ src/maasserver/tests/test_preseed.py	2014-04-23 03:46:12 +0000
@@ -62,6 +62,7 @@
     AllMatch,
     Contains,
     ContainsAll,
+    HasLength,
     IsInstance,
     MatchesAll,
     Not,
@@ -614,6 +615,60 @@
                 ]
             ))
 
+    def make_fastpath_node(self, main_arch=None):
+        """Return a `Node`, with FPI enabled, and the given main architecture.
+
+        :param main_arch: A main architecture, such as `i386` or `armhf`.  A
+            subarchitecture will be made up.
+        """
+        if main_arch is None:
+            main_arch = factory.make_name('arch')
+        arch = '%s/%s' % (main_arch, factory.make_name('subarch'))
+        node = factory.make_node(architecture=arch)
+        node.use_fastpath_installer()
+        return node
+
+    def extract_archive_setting(self, userdata):
+        """Extract the `ubuntu_archive` setting from `userdata`."""
+        userdata_lines = []
+        for line in userdata.splitlines():
+            line = line.strip()
+            if line.startswith('ubuntu_archive'):
+                userdata_lines.append(line)
+        self.assertThat(userdata_lines, HasLength(1))
+        [userdata_line] = userdata_lines
+        key, value = userdata_line.split(':', 1)
+        return value.strip()
+
+    def summarise_url(self, url):
+        """Return just the hostname and path from `url`, normalised."""
+        # This is needed because the userdata deliberately makes some minor
+        # changes to the archive URLs, making it harder to recognise which
+        # archive they use: slashes are added, schemes are hard-coded.
+        parsed_result = urlparse(url)
+        return parsed_result.netloc, parsed_result.path.strip('/')
+
+    def test_get_curtin_config_uses_main_archive_for_i386(self):
+        node = self.make_fastpath_node('i386')
+        userdata = get_curtin_config(node)
+        self.assertEqual(
+            self.summarise_url(Config.objects.get_config('main_archive')),
+            self.summarise_url(self.extract_archive_setting(userdata)))
+
+    def test_get_curtin_config_uses_main_archive_for_amd64(self):
+        node = self.make_fastpath_node('amd64')
+        userdata = get_curtin_config(node)
+        self.assertEqual(
+            self.summarise_url(Config.objects.get_config('main_archive')),
+            self.summarise_url(self.extract_archive_setting(userdata)))
+
+    def test_get_curtin_config_uses_ports_archive_for_other_arch(self):
+        node = self.make_fastpath_node()
+        userdata = get_curtin_config(node)
+        self.assertEqual(
+            self.summarise_url(Config.objects.get_config('ports_archive')),
+            self.summarise_url(self.extract_archive_setting(userdata)))
+
     def test_get_curtin_context(self):
         node = factory.make_node()
         node.use_fastpath_installer()