1
=== modified file 'contrib/preseeds_v2/curtin_userdata'
2
--- contrib/preseeds_v2/curtin_userdata	2014-04-15 14:56:09 +0000
3
+++ contrib/preseeds_v2/curtin_userdata	2014-04-21 11:47:42 +0000
4
@@ -28,7 +28,7 @@
5
28
power_state:
28
power_state:
6
29
  mode: reboot
29
  mode: reboot
7
30
30
9
31
{{if node.architecture in {'i386/generic', 'amd64/generic'} }}
31
{{if node.split_arch()[0] in {'i386', 'amd64'} }}
10
32
apt_mirrors:
32
apt_mirrors:
11
33
  ubuntu_archive: http://{{main_archive_hostname}}/{{main_archive_directory}}
33
  ubuntu_archive: http://{{main_archive_hostname}}/{{main_archive_directory}}
12
34
  ubuntu_security: http://{{main_archive_hostname}}/{{main_archive_directory}}
34
  ubuntu_security: http://{{main_archive_hostname}}/{{main_archive_directory}}
13
35
35
14
=== modified file 'src/maasserver/models/node.py'
15
--- src/maasserver/models/node.py	2014-04-03 15:49:39 +0000
16
+++ src/maasserver/models/node.py	2014-04-21 11:47:42 +0000
17
@@ -899,3 +899,8 @@
18
899
                "expression. This expression must instead be updated to set "
899
                "expression. This expression must instead be updated to set "
19
900
                "this node to install with the fast installer.")
900
                "this node to install with the fast installer.")
20
901
        self.tags.add(uti_tag)
901
        self.tags.add(uti_tag)
21
902
22
903
    def split_arch(self):
23
904
        """Return architecture and subarchitecture, as a tuple."""
24
905
        arch, subarch = self.architecture.split('/')
25
906
        return (arch, subarch)
26
902
907
27
=== modified file 'src/maasserver/models/tests/test_node.py'
28
--- src/maasserver/models/tests/test_node.py	2014-04-03 12:54:58 +0000
29
+++ src/maasserver/models/tests/test_node.py	2014-04-21 11:47:42 +0000
30
@@ -870,6 +870,13 @@
31
870
            "The use-fastpath-installer tag is defined with an expression",
870
            "The use-fastpath-installer tag is defined with an expression",
32
871
            unicode(error))
871
            unicode(error))
33
872
872
34
873
    def test_split_arch_returns_arch_as_tuple(self):
35
874
        main_arch = factory.make_name('arch')
36
875
        sub_arch = factory.make_name('subarch')
37
876
        full_arch = '%s/%s' % (main_arch, sub_arch)
38
877
        node = factory.make_node(architecture=full_arch)
39
878
        self.assertEqual((main_arch, sub_arch), node.split_arch())
40
879
41
873
880
42
874
class NodeRoutersTest(MAASServerTestCase):
881
class NodeRoutersTest(MAASServerTestCase):
43
875
882
44
876
883
45
=== modified file 'src/maasserver/tests/test_preseed.py'
46
--- src/maasserver/tests/test_preseed.py	2014-04-10 13:50:25 +0000
47
+++ src/maasserver/tests/test_preseed.py	2014-04-21 11:47:42 +0000
48
@@ -62,6 +62,7 @@
49
62
    AllMatch,
62
    AllMatch,
50
63
    Contains,
63
    Contains,
51
64
    ContainsAll,
64
    ContainsAll,
52
65
    HasLength,
53
65
    IsInstance,
66
    IsInstance,
54
66
    MatchesAll,
67
    MatchesAll,
55
67
    Not,
68
    Not,
56
@@ -614,6 +615,60 @@
57
614
                ]
615
                ]
58
615
            ))
616
            ))
59
616
617
60
618
    def make_fastpath_node(self, main_arch=None):
61
619
        """Return a `Node`, with FPI enabled, and the given main architecture.
62
620
63
621
        :param main_arch: A main architecture, such as `i386` or `armhf`.  A
64
622
            subarchitecture will be made up.
65
623
        """
66
624
        if main_arch is None:
67
625
            main_arch = factory.make_name('arch')
68
626
        arch = '%s/%s' % (main_arch, factory.make_name('subarch'))
69
627
        node = factory.make_node(architecture=arch)
70
628
        node.use_fastpath_installer()
71
629
        return node
72
630
73
631
    def extract_archive_setting(self, userdata):
74
632
        """Extract the `ubuntu_archive` setting from `userdata`."""
75
633
        userdata_lines = []
76
634
        for line in userdata.splitlines():
77
635
            line = line.strip()
78
636
            if line.startswith('ubuntu_archive'):
79
637
                userdata_lines.append(line)
80
638
        self.assertThat(userdata_lines, HasLength(1))
81
639
        [userdata_line] = userdata_lines
82
640
        key, value = userdata_line.split(':', 1)
83
641
        return value.strip()
84
642
85
643
    def summarise_url(self, url):
86
644
        """Return just the hostname and path from `url`, normalised."""
87
645
        # This is needed because the userdata deliberately makes some minor
88
646
        # changes to the archive URLs, making it harder to recognise which
89
647
        # archive they use: slashes are added, schemes are hard-coded.
90
648
        parsed_result = urlparse(url)
91
649
        return parsed_result.netloc, parsed_result.path.strip('/')
92
650
93
651
    def test_get_curtin_config_uses_main_archive_for_i386(self):
94
652
        node = self.make_fastpath_node('i386')
95
653
        userdata = get_curtin_config(node)
96
654
        self.assertEqual(
97
655
            self.summarise_url(Config.objects.get_config('main_archive')),
98
656
            self.summarise_url(self.extract_archive_setting(userdata)))
99
657
100
658
    def test_get_curtin_config_uses_main_archive_for_amd64(self):
101
659
        node = self.make_fastpath_node('amd64')
102
660
        userdata = get_curtin_config(node)
103
661
        self.assertEqual(
104
662
            self.summarise_url(Config.objects.get_config('main_archive')),
105
663
            self.summarise_url(self.extract_archive_setting(userdata)))
106
664
107
665
    def test_get_curtin_config_uses_ports_archive_for_other_arch(self):
108
666
        node = self.make_fastpath_node()
109
667
        userdata = get_curtin_config(node)
110
668
        self.assertEqual(
111
669
            self.summarise_url(Config.objects.get_config('ports_archive')),
112
670
            self.summarise_url(self.extract_archive_setting(userdata)))
113
671
114
617
    def test_get_curtin_context(self):
672
    def test_get_curtin_context(self):
115
618
        node = factory.make_node()
673
        node = factory.make_node()
116
619
        node.use_fastpath_installer()
674
        node.use_fastpath_installer()
Reviewer	Review Type	Date Requested	Status
Raphaël Badin (community)		2014-04-21	Approve on 2014-04-22
Review via email: mp+216582@code.launchpad.net