Merge lp:~tyler-baker/lava-dispatcher/consolidate-busybox-httpd into lp:lava-dispatcher
Proposed by
Tyler Baker
Status: | Merged |
---|---|
Merged at revision: | 677 |
Proposed branch: | lp:~tyler-baker/lava-dispatcher/consolidate-busybox-httpd |
Merge into: | lp:lava-dispatcher |
Diff against target: |
261 lines (+49/-108) 3 files modified
lava_dispatcher/device/bootloader.py (+6/-49) lava_dispatcher/device/ipmi_pxe.py (+4/-55) lava_dispatcher/device/target.py (+39/-4) |
To merge this branch: | bzr merge lp:~tyler-baker/lava-dispatcher/consolidate-busybox-httpd |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Antonio Terceiro | Approve | ||
Review via email: mp+184403@code.launchpad.net |
Description of the change
Consolidation of the busybox httpd logic. The ipmi_pxe and bootloader class both use these functions to allow the exchange of files to and from the target. It makes sense to reuse a single implementation, rather than maintaining both.
* Moved all the functionality into target.py for reuse.
* start_http_server -> start_busybox_
* stop_http_server -> stop_busybox_
Tested these changes on a bootloader device.
http://
However, I cannot test these changes on a highbank node until merged into staging.
To post a comment you must log in.
I know you're just moving code around so this is a side comment but does the httpd's pid really need to come to the host? Seems we could just execute
$ busybox httpd &
$ echo $! > /tmp/httpd.pid
to start and
$ kill `cat /tmp/httpd.pid`
to stop it.