From b18c3454b16a4b01155daaaa54c6663cf9498121 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 7 Nov 2017 15:06:49 +0100 Subject: Place board under boardlist We need to add some information to lab node, so we need to move all boards under a list("boardlist") --- README.md | 19 +++++----- boards.yaml | 109 +++++++++++++++++++++++++++++---------------------------- lavalab-gen.py | 4 +-- 3 files changed, 67 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index b8bb503..c92febe 100644 --- a/README.md +++ b/README.md @@ -23,15 +23,16 @@ A sample dhcpd config file is available in the dhcpd directory This file describe how are setuped your boards, and how they are connected and powered. ``` lab-slave-name: - devicename: - type: the devicetype of this device - pdu: - daemon: The hostname running the PDU daemon (always localhost) - host: The host name of the PDU as named in lavapdu.conf - port: portnumber (The port number of the PDU where the device is connected) - uart: - type: - serial: The serial number in case of FTDI uart + boardlist: + devicename: + type: the devicetype of this device + pdu: + daemon: The hostname running the PDU daemon (always localhost) + host: The host name of the PDU as named in lavapdu.conf + port: portnumber (The port number of the PDU where the device is connected) + uart: + type: + serial: The serial number in case of FTDI uart ``` Notes: uart FTDI only need serial diff --git a/boards.yaml b/boards.yaml index 1f3788f..e4f072d 100644 --- a/boards.yaml +++ b/boards.yaml @@ -1,55 +1,56 @@ lab-slave-0: - bcm2837-rpi-3-b-01: - type: bcm2837-rpi-3-b - pdu: - daemon: localhost - host: acme-0 - port: 1 - uart: - type: FTDI - serial: FT9QQZTA - am335x-boneblack-01: - type: beaglebone-black - pdu: - daemon: localhost - host: acme-0 - port: 2 - uart: - type: FTDI - serial: FT9QR1A9 - meson-gxl-s905x-libretech-cc-01: - type: meson-gxl-s905x-libretech-cc - pdu: - daemon: localhost - host: acme-0 - port: 3 - uart: - type: FTDI - serial: FT9QQYCN - dragonboard-410c-01: - type: dragonboard-410c - pdu: - daemon: localhost - host: acme-0 - port: 4 - uart: - type: FTDI - serial: FT9R7VDB - r8a7796-m3ulcb-01: - type: r8a7796-m3ulcb - pdu: - daemon: localhost - host: acme-0 - port: 5 - uart: - type: FTDI - serial: AK04WW0Q - imx6q-sabrelite-01: - type: imx6q-sabrelite - pdu: - daemon: localhost - host: acme-0 - port: 6 - uart: - type: FTDI - serial: FTAJMM4V + boardlist: + bcm2837-rpi-3-b-01: + type: bcm2837-rpi-3-b + pdu: + daemon: localhost + host: acme-0 + port: 1 + uart: + type: FTDI + serial: FT9QQZTA + am335x-boneblack-01: + type: beaglebone-black + pdu: + daemon: localhost + host: acme-0 + port: 2 + uart: + type: FTDI + serial: FT9QR1A9 + meson-gxl-s905x-libretech-cc-01: + type: meson-gxl-s905x-libretech-cc + pdu: + daemon: localhost + host: acme-0 + port: 3 + uart: + type: FTDI + serial: FT9QQYCN + dragonboard-410c-01: + type: dragonboard-410c + pdu: + daemon: localhost + host: acme-0 + port: 4 + uart: + type: FTDI + serial: FT9R7VDB + r8a7796-m3ulcb-01: + type: r8a7796-m3ulcb + pdu: + daemon: localhost + host: acme-0 + port: 5 + uart: + type: FTDI + serial: AK04WW0Q + imx6q-sabrelite-01: + type: imx6q-sabrelite + pdu: + daemon: localhost + host: acme-0 + port: 6 + uart: + type: FTDI + serial: FTAJMM4V diff --git a/lavalab-gen.py b/lavalab-gen.py index 379f6b9..6c1cb0f 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -52,8 +52,8 @@ def main(args): for lab_name in labs: lab = labs[lab_name] - for board_name in lab: - b = lab[board_name] + for board_name in lab["boardlist"]: + b = lab["boardlist"][board_name] if b.get("disabled", None): continue -- cgit 1.2.3-korg