1
=== modified file 'lava_dispatcher/client/base.py'
2
--- lava_dispatcher/client/base.py	2013-03-27 11:22:07 +0000
3
+++ lava_dispatcher/client/base.py	2013-04-16 02:42:25 +0000
4
@@ -154,7 +154,7 @@
5
154
        lava_server_ip = self._client.context.config.lava_server_ip
154
        lava_server_ip = self._client.context.config.lava_server_ip
6
155
        self.run(
155
        self.run(
7
156
            "LC_ALL=C ping -W4 -c1 %s" % lava_server_ip,
156
            "LC_ALL=C ping -W4 -c1 %s" % lava_server_ip,
9
157
            ["1 received", "0 received", "Network is unreachable"],
157
            ["1 received|1 packets received", "0 received|0 packets received", "Network is unreachable"],
10
158
            timeout=5, failok=True)
158
            timeout=5, failok=True)
11
159
        if self.match_id == 0:
159
        if self.match_id == 0:
12
160
            return True
160
            return True
13
161
161
14
=== modified file 'lava_dispatcher/client/lmc_utils.py'
15
--- lava_dispatcher/client/lmc_utils.py	2013-02-18 03:19:14 +0000
16
+++ lava_dispatcher/client/lmc_utils.py	2013-04-16 02:42:25 +0000
17
@@ -15,7 +15,8 @@
18
15
    )
15
    )
19
16
16
20
17
17
22
18
def generate_image(client, hwpack_url, rootfs_url, outdir, bootloader='u_boot', rootfstype=None):
18
def generate_image(client, hwpack_url, rootfs_url, outdir, bootloader='u_boot', rootfstype=None,
23
19
                   extra_boot_args=None, image_size=None):
24
19
    """Generate image from a hwpack and rootfs url
20
    """Generate image from a hwpack and rootfs url
25
20
21
26
21
    :param hwpack_url: url of the Linaro hwpack to download
22
    :param hwpack_url: url of the Linaro hwpack to download
27
@@ -47,6 +48,10 @@
28
47
           (client.config.lmc_dev_arg, image_file, rootfs_path, hwpack_path, bootloader))
48
           (client.config.lmc_dev_arg, image_file, rootfs_path, hwpack_path, bootloader))
29
48
    if rootfstype is not None:
49
    if rootfstype is not None:
30
49
        cmd += ' --rootfs ' + rootfstype
50
        cmd += ' --rootfs ' + rootfstype
31
51
    if image_size is not None:
32
52
        cmd += ' --image-size ' + image_size
33
53
    if extra_boot_args is not None:
34
54
        cmd += ' --extra-boot-args "%s"' % extra_boot_args
35
50
    logging.info("Executing the linaro-media-create command")
55
    logging.info("Executing the linaro-media-create command")
36
51
    logging.info(cmd)
56
    logging.info(cmd)
37
52
57
38
53
58
39
=== modified file 'lava_dispatcher/config.py'
40
--- lava_dispatcher/config.py	2013-04-05 17:19:57 +0000
41
+++ lava_dispatcher/config.py	2013-04-16 02:42:25 +0000
42
@@ -104,6 +104,8 @@
43
104
        default='Press Enter to stop auto boot...')
104
        default='Press Enter to stop auto boot...')
44
105
    vexpress_usb_mass_storage_device = schema.StringOption(default=None)
105
    vexpress_usb_mass_storage_device = schema.StringOption(default=None)
45
106
106
46
107
    ecmeip = schema.StringOption()
47
108
48
107
class OptionDescriptor(object):
109
class OptionDescriptor(object):
49
108
    def __init__(self, name):
110
    def __init__(self, name):
50
109
        self.name = name
111
        self.name = name
51
110
112
52
=== added file 'lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf'
53
--- lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf	1970-01-01 00:00:00 +0000
54
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf	2013-04-16 02:42:25 +0000
55
@@ -0,0 +1,2 @@
56
1
client_type = highbank
57
2
connection_command = ipmitool -I lanplus -U admin -P admin -H %(ecmeip)s sol activate
58
0
3
59
=== added file 'lava_dispatcher/device/highbank.py'
60
--- lava_dispatcher/device/highbank.py	1970-01-01 00:00:00 +0000
61
+++ lava_dispatcher/device/highbank.py	2013-04-16 02:42:25 +0000
62
@@ -0,0 +1,261 @@
63
1
# Copyright (C) 2012 Linaro Limited
64
2
#
65
3
# Author: Michael Hudson-Doyle <michael.hudson@linaro.org>
66
4
# Author: Nicholas Schutt <nick.schutt@linaro.org>
67
5
#
68
6
# This file is part of LAVA Dispatcher.
69
7
#
70
8
# LAVA Dispatcher is free software; you can redistribute it and/or modify
71
9
# it under the terms of the GNU General Public License as published by
72
10
# the Free Software Foundation; either version 2 of the License, or
73
11
# (at your option) any later version.
74
12
#
75
13
# LAVA Dispatcher is distributed in the hope that it will be useful,
76
14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
77
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
78
16
# GNU General Public License for more details.
79
17
#
80
18
# You should have received a copy of the GNU General Public License
81
19
# along
82
20
# with this program; if not, see <http://www.gnu.org/licenses>.
83
21
84
22
import contextlib
85
23
import logging
86
24
import os
87
25
import pexpect
88
26
import time
89
27
90
28
from lava_dispatcher import tarballcache
91
29
92
30
from lava_dispatcher.device.master import (
93
31
    MasterCommandRunner,
94
32
)
95
33
from lava_dispatcher.device.target import (
96
34
    Target
97
35
)
98
36
from lava_dispatcher.errors import (
99
37
    NetworkError,
100
38
    CriticalError,
101
39
    OperationFailed,
102
40
)
103
41
from lava_dispatcher.downloader import (
104
42
    download_image,
105
43
    download_with_retry,
106
44
    )
107
45
from lava_dispatcher.utils import (
108
46
    mk_targz,
109
47
    rmtree,
110
48
)
111
49
from lava_dispatcher.client.lmc_utils import (
112
50
    generate_image,
113
51
)
114
52
from lava_dispatcher.ipmi import IpmiPxeBoot
115
53
116
54
117
55
class HighbankTarget(Target):
118
56
119
57
    MASTER_PS1 = 'root@master [rc=$(echo \$?)]# '
120
58
    MASTER_PS1_PATTERN = 'root@master \[rc=(\d+)\]# '
121
59
122
60
    def __init__(self, context, config):
123
61
        super(HighbankTarget, self).__init__(context, config)
124
62
        self.proc = self.context.spawn(self.config.connection_command, timeout=1200)
125
63
        self.device_version = None
126
64
        if self.config.ecmeip == None:
127
65
            msg = "The ecmeip address is not set for this target"
128
66
            logging.error(msg)
129
67
            raise CriticalError(msg)
130
68
        self.bootcontrol = IpmiPxeBoot(context, self.config.ecmeip)
131
69
132
70
    def get_device_version(self):
133
71
        return self.device_version
134
72
135
73
    def power_on(self):
136
74
        self.bootcontrol.power_on_boot_image()
137
75
        return self.proc
138
76
139
77
    def power_off(self, proc):
140
78
        self.bootcontrol.power_off()
141
79
142
80
    def deploy_linaro(self, hwpack, rfs, bootloader):
143
81
        image_file = generate_image(self, hwpack, rfs, self.scratch_dir, bootloader,
144
82
                                    extra_boot_args='1', image_size='1G')
145
83
        self._customize_linux(image_file)
146
84
        self._deploy_image(image_file, '/dev/sda')
147
85
148
86
    def deploy_linaro_prebuilt(self, image):
149
87
        image_file = download_image(image, self.context, self.scratch_dir)
150
88
        self._customize_linux(image_file)
151
89
        self._deploy_image(image_file, '/dev/sda')
152
90
153
91
    def _deploy_image(self, image_file, device):
154
92
        with self._as_master() as runner:
155
93
156
94
            # compress the image to reduce the transfer size
157
95
            if not image_file.endswith('.bz2') and not image_file.endswith('gz'):
158
96
                os.system('bzip2 -9v ' + image_file)
159
97
                image_file += '.bz2'
160
98
161
99
            tmpdir = self.context.config.lava_image_tmpdir
162
100
            url = self.context.config.lava_image_url
163
101
            image_file = image_file.replace(tmpdir, '')
164
102
            image_url = '/'.join(u.strip('/') for u in [url, image_file])
165
103
166
104
            build_dir = '/builddir'
167
105
            image_file_base = build_dir + '/' + '/'.join(image_file.split('/')[-1:])
168
106
169
107
            decompression_cmd = None
170
108
            if image_file_base.endswith('.gz'):
171
109
                decompression_cmd = '/bin/gzip -dc'
172
110
            elif image_file_base.endswith('.bz2'):
173
111
                decompression_cmd = '/bin/bzip2 -dc'
174
112
175
113
            runner.run('mkdir %s' % build_dir)
176
114
            runner.run('mount -t tmpfs -o size=50%% tmpfs %s' % build_dir)
177
115
            runner.run('wget -O %s %s' % (image_file_base, image_url), timeout=1800)
178
116
179
117
            if decompression_cmd != None:
180
118
                cmd = '%s %s | dd bs=4M of=%s' % (decompression_cmd, image_file_base, device)
181
119
            else:
182
120
                cmd = 'dd bs=4M if=%s of=%s' % (image_file_base, device)
183
121
184
122
            runner.run(cmd, timeout=1800)
185
123
            runner.run('umount %s' % build_dir)
186
124
187
125
    def get_partition(self, runner, partition):
188
126
        if partition == self.config.boot_part:
189
127
            partition = '/dev/disk/by-label/boot'
190
128
        elif partition == self.config.root_part:
191
129
            partition = '/dev/disk/by-label/rootfs'
192
130
        else:
193
131
            raise RuntimeError(
194
132
                'unknown master image partition(%d)' % partition)
195
133
        return partition
196
134
197
135
198
136
    @contextlib.contextmanager
199
137
    def file_system(self, partition, directory):
200
138
        logging.info('attempting to access master filesystem %r:%s' %
201
139
            (partition, directory))
202
140
203
141
        assert directory != '/', "cannot mount entire partition"
204
142
205
143
        with self._as_master() as runner:
206
144
            runner.run('mkdir -p /mnt')
207
145
            partition = self.get_partition(runner, partition)
208
146
            runner.run('mount %s /mnt' % partition)
209
147
            try:
210
148
                targetdir = '/mnt/%s' % directory
211
149
                runner.run('mkdir -p %s' % targetdir)
212
150
213
151
                parent_dir, target_name = os.path.split(targetdir)
214
152
215
153
                runner.run('/bin/tar -cmzf /tmp/fs.tgz -C %s %s' % (parent_dir, target_name))
216
154
                runner.run('cd /tmp')  # need to be in same dir as fs.tgz
217
155
218
156
                url_base = runner.start_http_server()
219
157
                
220
158
                url = url_base + '/fs.tgz'
221
159
                logging.info("Fetching url: %s" % url)
222
160
                tf = download_with_retry(self.context, self.scratch_dir, url, False)
223
161
224
162
                tfdir = os.path.join(self.scratch_dir, str(time.time()))
225
163
226
164
                try:
227
165
                    os.mkdir(tfdir)
228
166
                    self.context.run_command('/bin/tar -C %s -xzf %s' % (tfdir, tf))
229
167
                    yield os.path.join(tfdir, target_name)
230
168
231
169
                finally:
232
170
                    tf = os.path.join(self.scratch_dir, 'fs.tgz')
233
171
                    mk_targz(tf, tfdir)
234
172
                    rmtree(tfdir)
235
173
236
174
                    # get the last 2 parts of tf, ie "scratchdir/tf.tgz"
237
175
                    tf = '/'.join(tf.split('/')[-2:])
238
176
                    runner.run('rm -rf %s' % targetdir)
239
177
                    self._target_extract(runner, tf, parent_dir)
240
178
241
179
            finally:
242
180
                    runner.stop_http_server()
243
181
                    runner.run('umount /mnt')
244
182
245
183
    def _target_extract(self, runner, tar_file, dest, timeout=-1):
246
184
        tmpdir = self.context.config.lava_image_tmpdir
247
185
        url = self.context.config.lava_image_url
248
186
        tar_file = tar_file.replace(tmpdir, '')
249
187
        tar_url = '/'.join(u.strip('/') for u in [url, tar_file])
250
188
        self._target_extract_url(runner,tar_url,dest,timeout=timeout)
251
189
252
190
    def _target_extract_url(self, runner, tar_url, dest, timeout=-1):
253
191
        decompression_cmd = ''
254
192
        if tar_url.endswith('.gz') or tar_url.endswith('.tgz'):
255
193
            decompression_cmd = '| /bin/gzip -dc'
256
194
        elif tar_url.endswith('.bz2'):
257
195
            decompression_cmd = '| /bin/bzip2 -dc'
258
196
        elif tar_url.endswith('.tar'):
259
197
            decompression_cmd = ''
260
198
        else:
261
199
            raise RuntimeError('bad file extension: %s' % tar_url)
262
200
263
201
        runner.run('wget -O - %s %s | /bin/tar -C %s -xmf -'
264
202
            % (tar_url, decompression_cmd, dest),
265
203
            timeout=timeout)
266
204
267
205
    @contextlib.contextmanager
268
206
    def _as_master(self):
269
207
        self.bootcontrol.power_on_boot_master()
270
208
271
209
        # Two reboots seem to be necessary to ensure that pxe boot is used.
272
210
        # Need to identify the cause and fix it
273
211
        self.proc.expect("Hit any key to stop autoboot:")
274
212
        self.proc.sendline('')
275
213
        self.bootcontrol.power_reset_boot_master()
276
214
277
215
        self.proc.expect("\(initramfs\)")
278
216
        self.proc.sendline('export PS1="%s"' % self.MASTER_PS1)
279
217
        self.proc.expect(self.MASTER_PS1_PATTERN, timeout=180, lava_no_logging=1)
280
218
        runner = HBMasterCommandRunner(self)
281
219
        runner.run(". /scripts/functions")
282
220
        device = "eth0"
283
221
        runner.run("DEVICE=%s configure_networking" % device)
284
222
285
223
        self.device_version = runner.get_device_version()
286
224
287
225
        try:
288
226
            yield runner
289
227
        finally:
290
228
           logging.debug("deploy done")
291
229
292
230
293
231
target_class = HighbankTarget
294
232
295
233
296
234
class HBMasterCommandRunner(MasterCommandRunner):
297
235
    """A CommandRunner to use when the target is booted into the master image.
298
236
    """
299
237
    http_pid = None
300
238
    
301
239
    def __init__(self, target):
302
240
        super(HBMasterCommandRunner, self).__init__(target)
303
241
304
242
    def start_http_server(self):
305
243
        master_ip = self.get_master_ip()
306
244
        if self.http_pid != None:
307
245
            raise OperationFailed("busybox httpd already running with pid %" % self.http_pid)
308
246
        # busybox produces no output to parse for, so run it in the bg and get its pid
309
247
        self.run('busybox httpd -f &')
310
248
        self.run('echo pid:$!:pid',response="pid:(\d+):pid",timeout=10)
311
249
        if self.match_id != 0:
312
250
            raise OperationFailed("busybox httpd did not start")
313
251
        else:
314
252
            self.http_pid = self.match.group(1)
315
253
        url_base = "http://%s" % (master_ip)
316
254
        return url_base
317
255
318
256
    def stop_http_server(self):
319
257
        if self.http_pid == None:
320
258
            raise OperationFailed("busybox httpd not running, but stop_http_server called.")
321
259
        self.run('kill %s' % self.http_pid)
322
260
        self.http_pid = None
323
261
324
0
262
325
=== added file 'lava_dispatcher/ipmi.py'
326
--- lava_dispatcher/ipmi.py	1970-01-01 00:00:00 +0000
327
+++ lava_dispatcher/ipmi.py	2013-04-16 02:42:25 +0000
328
@@ -0,0 +1,85 @@
329
1
# Copyright (C) 2013 Linaro Limited
330
2
#
331
3
# Authors:
332
4
#   Antonio Terceiro <antonio.terceiro@linaro.org>
333
5
#   Michael Hudson-Doyle <michael.hudson@linaro.org>
334
6
#
335
7
# This file is part of LAVA Dispatcher.
336
8
#
337
9
# LAVA Dispatcher is free software; you can redistribute it and/or modify
338
10
# it under the terms of the GNU General Public License as published by
339
11
# the Free Software Foundation; either version 2 of the License, or
340
12
# (at your option) any later version.
341
13
#
342
14
# LAVA Dispatcher is distributed in the hope that it will be useful,
343
15
# but WITHOUT ANY WARRANTY; without even the implied warranty of
344
16
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
345
17
# GNU General Public License for more details.
346
18
#
347
19
# You should have received a copy of the GNU General Public License
348
20
# along
349
21
# with this program; if not, see <http://www.gnu.org/licenses>.
350
22
351
23
352
24
class IPMITool(object):
353
25
    """
354
26
    This class wraps the ipmitool CLI to provide a convenient object-oriented
355
27
    API that can be composed into the implementation of devices that can be
356
28
    managed with IPMI.
357
29
    """
358
30
359
31
    def __init__(self, context, host, ipmitool="ipmitool"):
360
32
        self.host = host
361
33
        self.context = context
362
34
        self.ipmitool = ipmitool
363
35
364
36
    def __ipmi(self, command):
365
37
        self.context.run_command(
366
38
            "%s -H %s -U admin -P admin %s" % (
367
39
                self.ipmitool, self.host, command
368
40
            )
369
41
        )
370
42
371
43
    def set_to_boot_from_disk(self):
372
44
        self.__ipmi("chassis bootdev disk")
373
45
374
46
    def set_to_boot_from_pxe(self):
375
47
        self.__ipmi("chassis bootdev pxe")
376
48
377
49
    def power_off(self):
378
50
        self.__ipmi("chassis power off")
379
51
380
52
    def power_on(self):
381
53
        self.__ipmi("chassis power on")
382
54
383
55
    def reset(self):
384
56
        self.__ipmi("chassis power reset")
385
57
386
58
387
59
class IpmiPxeBoot(object):
388
60
    """
389
61
    This class provides a convenient object-oriented API that can be
390
62
    used to initiate power on/off and boot device selection for pxe
391
63
    and disk boot devices using ipmi commands.
392
64
    """
393
65
394
66
    def __init__(self, context, host):
395
67
        self.ipmitool = IPMITool(context, host)
396
68
397
69
    def power_on_boot_master(self):
398
70
        self.ipmitool.set_to_boot_from_pxe()
399
71
        self.ipmitool.power_on()
400
72
        self.ipmitool.reset()
401
73
402
74
    def power_reset_boot_master(self):
403
75
        self.ipmitool.set_to_boot_from_pxe()
404
76
        self.ipmitool.reset()
405
77
406
78
    def power_on_boot_image(self):
407
79
        self.ipmitool.set_to_boot_from_disk()
408
80
        self.ipmitool.power_on()
409
81
        self.ipmitool.reset()
410
82
411
83
    def power_off(self):
412
84
        self.ipmitool.power_off()
413
85
Status:	Superseded
Proposed branch:	lp:~nick-schutt/lava-dispatcher/nicks-highbank-support
Merge into:	lp:lava-dispatcher
Diff against target:	413 lines (+357/-2) 6 files modified lava_dispatcher/client/base.py (+1/-1) lava_dispatcher/client/lmc_utils.py (+6/-1) lava_dispatcher/config.py (+2/-0) lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf (+2/-0) lava_dispatcher/device/highbank.py (+261/-0) lava_dispatcher/ipmi.py (+85/-0)
To merge this branch:	bzr merge lp:~nick-schutt/lava-dispatcher/nicks-highbank-support
Related bugs:	Link a bug report
Related blueprints:	Support Calxeda Highbank Nodes (Essential)
Reviewer	Review Type	Date Requested	Status
Antonio Terceiro		2013-04-08	Needs Fixing on 2013-04-08
Review via email: mp+157658@code.launchpad.net