1
=== modified file 'quickstart/app.py'
2
--- quickstart/app.py	2013-11-20 11:35:30 +0000
3
+++ quickstart/app.py	2013-11-20 21:43:48 +0000
4
@@ -45,6 +45,36 @@
5
45
        return 'juju-quickstart: error: {}'.format(self.message)
45
        return 'juju-quickstart: error: {}'.format(self.message)
6
46
46
7
47
47
8
48
def ensure_dependencies():
9
49
    """Ensure that Juju and LXC are installed.
10
50
11
51
    If juju is not found in the PATH, then add the juju stable PPA and install
12
52
    both juju and lxc.
13
53
14
54
    Return when juju is available.
15
55
    Raise a ProgramExit if an error occurs installing.
16
56
    """
17
57
    retcode = utils.call('juju', 'version')[0]
18
58
    retcode += utils.call('lxc-ls')[0]
19
59
    if retcode > 0:
20
60
        cmds = [
21
61
            ['apt-add-repository', '-y', 'ppa:juju/stable'],
22
62
            ['apt-get', 'update'],
23
63
            ['apt-get', 'install', '-y', 'juju-core', 'lxc']
24
64
        ]
25
65
        for cmd in cmds:
26
66
            cmd.insert(0, 'sudo')
27
67
            retcode, _, error = utils.call(*cmd)
28
68
            if retcode:
29
69
                raise ProgramExit(error)
30
70
        # XXX Makyo #1247214:
31
71
            # Here, we should guide the user through cloud credentials and
32
72
            # juju init.
33
73
        raise ProgramExit('Juju is now installed; please run `juju init` and '
34
74
                          'then the same juju quickstart command again to '
35
75
                          'proceed.')
36
76
37
77
38
48
def bootstrap(env_name, is_local=False, debug=False):
78
def bootstrap(env_name, is_local=False, debug=False):
39
49
    """Bootstrap the Juju environment with the given name.
79
    """Bootstrap the Juju environment with the given name.
40
50
80
41
51
81
42
=== modified file 'quickstart/manage.py'
43
--- quickstart/manage.py	2013-11-20 11:35:30 +0000
44
+++ quickstart/manage.py	2013-11-20 21:43:48 +0000
45
@@ -218,6 +218,8 @@
46
218
def run(options):
218
def run(options):
47
219
    """Run the application."""
219
    """Run the application."""
48
220
    print('juju quickstart v{}'.format(version))
220
    print('juju quickstart v{}'.format(version))
49
221
    print('ensuring juju and lxc are installed')
50
222
    app.ensure_dependencies()
51
221
    print('bootstrapping the {} environment (type: {})'.format(
223
    print('bootstrapping the {} environment (type: {})'.format(
52
222
        options.env_name, options.env_type))
224
        options.env_name, options.env_type))
53
223
    is_local = options.env_type == 'local'
225
    is_local = options.env_type == 'local'
54
224
226
55
=== modified file 'quickstart/tests/test_app.py'
56
--- quickstart/tests/test_app.py	2013-11-20 11:35:30 +0000
57
+++ quickstart/tests/test_app.py	2013-11-20 21:43:48 +0000
58
@@ -61,6 +61,68 @@
59
61
        return jujuclient.EnvError({'Error': message})
61
        return jujuclient.EnvError({'Error': message})
60
62
62
61
63
63
62
64
class TestEnsureDependencies(
63
65
        helpers.CallTestsMixin, ProgramExitTestsMixin, unittest.TestCase):
64
66
65
67
    def call_ensure_dependencies(self, call_effects):
66
68
        with self.patch_multiple_calls(call_effects) as mock_call:
67
69
            app.ensure_dependencies()
68
70
        return mock_call
69
71
70
72
    def test_success_install(self):
71
73
        # XXX Makyo #1247214:
72
74
            # Here, we should guide the user through cloud credentials and
73
75
            # juju init.
74
76
        with self.assert_program_exit('Juju is now installed; please run '
75
77
                                      '`juju init` and then the same juju '
76
78
                                      'quickstart command again to '
77
79
                                      'proceed.'):
78
80
            call = self.call_ensure_dependencies(
79
81
                [
80
82
                    (127, '', 'no juju'),
81
83
                    (127, '', 'no lxc'),
82
84
                    (0, 'add repo', ''),
83
85
                    (0, 'update', ''),
84
86
                    (0, 'install', ''),
85
87
                ]
86
88
            )
87
89
            self.assertEqual(call.call_count, 5)
88
90
            call.assert_has_calls([
89
91
                mock.call('juju', 'version'),
90
92
                mock.call('lxc-ls'),
91
93
                mock.call('sudo', 'apt-add-repository', '-y',
92
94
                          'ppa:juju/stable'),
93
95
                mock.call('sudo', 'apt-get', 'update'),
94
96
                mock.call('sudo', 'apt-get', 'install', '-y', 'juju-core',
95
97
                          'lxc'),
96
98
            ])
97
99
98
100
    def test_success_no_install(self):
99
101
        call = self.call_ensure_dependencies(
100
102
            [
101
103
                (0, '1.16', ''),
102
104
                (0, '', ''),
103
105
                (0, 'add repo', ''),
104
106
                (0, 'update', ''),
105
107
                (0, 'install', ''),
106
108
            ]
107
109
        )
108
110
        self.assertEqual(call.call_count, 2)
109
111
110
112
    def test_failure(self):
111
113
        with self.assert_program_exit('install failure'):
112
114
            call = self.call_ensure_dependencies(
113
115
                [
114
116
                    (127, '', ''),
115
117
                    (127, '', ''),
116
118
                    (1, 'add repo', 'install failure'),
117
119
                    (1, 'update', 'uh-oh'),
118
120
                    (1, 'install', 'oh no'),
119
121
                ]
120
122
            )
121
123
            self.assertEqual(call.call_count, 3)
122
124
123
125
124
64
@mock_print
126
@mock_print
125
65
class TestBootstrap(
127
class TestBootstrap(
126
66
        helpers.CallTestsMixin, ProgramExitTestsMixin, unittest.TestCase):
128
        helpers.CallTestsMixin, ProgramExitTestsMixin, unittest.TestCase):
Status:	Merged
Merged at revision:	19
Proposed branch:	lp:~makyo/juju-quickstart/ensure-juju-lxc
Merge into:	lp:juju-quickstart
Diff against target:	126 lines (+94/-0) 3 files modified quickstart/app.py (+30/-0) quickstart/manage.py (+2/-0) quickstart/tests/test_app.py (+62/-0)
To merge this branch:	bzr merge lp:~makyo/juju-quickstart/ensure-juju-lxc
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju GUI Hackers		2013-11-20	Pending
Review via email: mp+196011@code.launchpad.net