1
=== added file 'src/provisioningserver/utils/curtin.py'
2
--- src/provisioningserver/utils/curtin.py	1970-01-01 00:00:00 +0000
3
+++ src/provisioningserver/utils/curtin.py	2014-09-29 02:51:51 +0000
4
@@ -0,0 +1,51 @@
5
1
# Copyright 2014 Canonical Ltd.  This software is licensed under the
6
2
# GNU Affero General Public License version 3 (see the file LICENSE).
7
3
8
4
"""Utilities related to Curtin."""
9
5
10
6
from __future__ import (
11
7
    absolute_import,
12
8
    print_function,
13
9
    unicode_literals,
14
10
    )
15
11
16
12
str = None
17
13
18
14
__metaclass__ = type
19
15
__all__ = [
20
16
    'compose_mv_command',
21
17
    'compose_write_text_file',
22
18
    ]
23
19
24
20
25
21
def compose_write_text_file(path, content, owner='root:root',
26
22
                            permissions=0600):
27
23
    """Return preseed for uploading a text file to the install target.
28
24
29
25
    Use this to write files into the filesystem that Curtin is installing.  The
30
26
    result goes into a `write_files` preseed entry.
31
27
    """
32
28
    return {
33
29
        'path': path,
34
30
        'content': content,
35
31
        'owner': owner,
36
32
        'permissions': '0%o' % permissions,
37
33
        }
38
34
39
35
40
36
def compose_mv_command(source, dest):
41
37
    """Return preseed for running the `mv` command in the install target.
42
38
43
39
    Use this for moving files around in the filesystem that Curtin is
44
40
    installing.  The result goes in a preseed entry for running commands, such
45
41
    as an entry in `late_commands` dict.
46
42
    """
47
43
    return [
48
44
        'curtin',
49
45
        'in-target',
50
46
        '--',
51
47
        'mv',
52
48
        '--',
53
49
        source,
54
50
        dest,
55
51
        ]
56
0
52
57
=== added file 'src/provisioningserver/utils/tests/test_curtin.py'
58
--- src/provisioningserver/utils/tests/test_curtin.py	1970-01-01 00:00:00 +0000
59
+++ src/provisioningserver/utils/tests/test_curtin.py	2014-09-29 02:51:51 +0000
60
@@ -0,0 +1,96 @@
61
1
# Copyright 2014 Canonical Ltd.  This software is licensed under the
62
2
# GNU Affero General Public License version 3 (see the file LICENSE).
63
3
64
4
"""Tests for Curtin-related utilities."""
65
5
66
6
from __future__ import (
67
7
    absolute_import,
68
8
    print_function,
69
9
    unicode_literals,
70
10
    )
71
11
72
12
str = None
73
13
74
14
__metaclass__ = type
75
15
__all__ = []
76
16
77
17
from maastesting.factory import factory
78
18
from maastesting.testcase import MAASTestCase
79
19
from provisioningserver.utils.curtin import (
80
20
    compose_mv_command,
81
21
    compose_write_text_file,
82
22
    )
83
23
from testtools.matchers import (
84
24
    AllMatch,
85
25
    ContainsAll,
86
26
    IsInstance,
87
27
    )
88
28
89
29
90
30
class TestComposeMvCommand(MAASTestCase):
91
31
92
32
    def test__returns_command_list(self):
93
33
        command = compose_mv_command(
94
34
            factory.make_name('source'), factory.make_name('dest'))
95
35
        self.expectThat(command, IsInstance(list))
96
36
        self.expectThat(command, AllMatch(IsInstance(unicode)))
97
37
98
38
    def test__runs_command_in_target(self):
99
39
        command = compose_mv_command(
100
40
            factory.make_name('source'), factory.make_name('dest'))
101
41
        self.assertEqual(['curtin', 'in-target', '--'], command[:3])
102
42
103
43
    def test__moves_file(self):
104
44
        source = factory.make_name('source')
105
45
        dest = factory.make_name('dest')
106
46
        self.assertEqual(
107
47
            ['mv', '--', source, dest],
108
48
            compose_mv_command(source, dest)[-4:])
109
49
110
50
111
51
class TestComposeWriteTextFile(MAASTestCase):
112
52
113
53
    def test__returns_complete_write_file_dict(self):
114
54
        preseed = compose_write_text_file(
115
55
            factory.make_name('file'), factory.make_name('content'))
116
56
        self.expectThat(preseed, IsInstance(dict))
117
57
        self.expectThat(
118
58
            preseed.keys(),
119
59
            ContainsAll(['path', 'content', 'owner', 'permissions']))
120
60
121
61
    def test__obeys_path_param(self):
122
62
        path = factory.make_name('path')
123
63
        preseed = compose_write_text_file(path, factory.make_name('content'))
124
64
        self.assertEqual(path, preseed['path'])
125
65
126
66
    def test__obeys_content_param(self):
127
67
        content = factory.make_name('content')
128
68
        preseed = compose_write_text_file(factory.make_name('path'), content)
129
69
        self.assertEqual(content, preseed['content'])
130
70
131
71
    def test__defaults_owner_to_root(self):
132
72
        preseed = compose_write_text_file(
133
73
            factory.make_name('file'), factory.make_name('content'))
134
74
        self.assertEqual('root:root', preseed['owner'])
135
75
136
76
    def test__obeys_owner_param(self):
137
77
        owner = '%s:%s' % (
138
78
            factory.make_name('user'),
139
79
            factory.make_name('group'),
140
80
            )
141
81
        preseed = compose_write_text_file(
142
82
            factory.make_name('file'), factory.make_name('content'),
143
83
            owner=owner)
144
84
        self.assertEqual(owner, preseed['owner'])
145
85
146
86
    def test__defaults_permissions_to_0600(self):
147
87
        preseed = compose_write_text_file(
148
88
            factory.make_name('file'), factory.make_name('content'))
149
89
        self.assertEqual('0600', preseed['permissions'])
150
90
151
91
    def test__obeys_permissions_param(self):
152
92
        permissions = 0123
153
93
        preseed = compose_write_text_file(
154
94
            factory.make_name('file'), factory.make_name('content'),
155
95
            permissions=permissions)
156
96
        self.assertEqual('0123', preseed['permissions'])
Status:	Merged
Approved by:	Jeroen T. Vermeulen on 2014-09-29
Approved revision:	no longer in the source branch.
Merged at revision:	3118
Proposed branch:	lp:~jtv/maas/curtin-preseed-helpers
Merge into:	lp:~maas-committers/maas/trunk
Diff against target:	156 lines (+147/-0) 2 files modified src/provisioningserver/utils/curtin.py (+51/-0) src/provisioningserver/utils/tests/test_curtin.py (+96/-0)
To merge this branch:	bzr merge lp:~jtv/maas/curtin-preseed-helpers
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Gavin Panella (community)		2014-09-29	Approve on 2014-09-29
Review via email: mp+236275@code.launchpad.net