From 8e455ba91806f10d7d418966b89ac4a3a50e448b Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Mon, 28 Jun 2021 13:58:20 +0200
Subject: [PATCH 1/3] [input] add id to each disk

Map sda => disk0, sdb => disk1... and the nvme disks at the end.
By convention, disk0 is the primary disk.
---
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-10.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-11.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-12.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-13.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-14.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-15.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-16.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-17.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-18.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-19.yaml         | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-20.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-21.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-22.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-23.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-24.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-25.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-26.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-27.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-28.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-29.yaml         | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-30.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-31.yaml         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-32.yaml         | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml | 3 +++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml | 2 ++
 .../sites/grenoble/clusters/drac/nodes/drac-10.yaml         | 2 ++
 .../sites/grenoble/clusters/drac/nodes/drac-11.yaml         | 2 ++
 .../sites/grenoble/clusters/drac/nodes/drac-12.yaml         | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml | 2 ++
 .../sites/grenoble/clusters/troll/nodes/troll-1.yaml        | 2 ++
 .../sites/grenoble/clusters/troll/nodes/troll-2.yaml        | 2 ++
 .../sites/grenoble/clusters/troll/nodes/troll-3.yaml        | 2 ++
 .../sites/grenoble/clusters/troll/nodes/troll-4.yaml        | 2 ++
 .../grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml | 6 ++++++
 .../grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml | 6 ++++++
 .../grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml | 6 ++++++
 .../grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml | 6 ++++++
 .../sites/lille/clusters/chetemi/nodes/chetemi-1.yaml       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-10.yaml      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-11.yaml      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-12.yaml      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-13.yaml      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-14.yaml      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-15.yaml      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-2.yaml       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-3.yaml       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-4.yaml       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-5.yaml       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-6.yaml       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-7.yaml       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-8.yaml       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-9.yaml       | 2 ++
 .../sites/lille/clusters/chiclet/nodes/chiclet-1.yaml       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-2.yaml       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-3.yaml       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-4.yaml       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-5.yaml       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-6.yaml       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-7.yaml       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-8.yaml       | 3 +++
 .../sites/lille/clusters/chifflet/nodes/chifflet-1.yaml     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-2.yaml     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-3.yaml     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-4.yaml     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-5.yaml     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-6.yaml     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-7.yaml     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-8.yaml     | 4 ++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-1.yaml     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-2.yaml     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-3.yaml     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-4.yaml     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-5.yaml     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-6.yaml     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-7.yaml     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-8.yaml     | 6 ++++++
 .../clusters/petitprince/nodes/petitprince-1.yaml           | 1 +
 .../clusters/petitprince/nodes/petitprince-10.yaml          | 1 +
 .../clusters/petitprince/nodes/petitprince-11.yaml          | 1 +
 .../clusters/petitprince/nodes/petitprince-13.yaml          | 1 +
 .../clusters/petitprince/nodes/petitprince-14.yaml          | 1 +
 .../clusters/petitprince/nodes/petitprince-15.yaml          | 1 +
 .../clusters/petitprince/nodes/petitprince-16.yaml          | 1 +
 .../clusters/petitprince/nodes/petitprince-2.yaml           | 1 +
 .../clusters/petitprince/nodes/petitprince-3.yaml           | 1 +
 .../clusters/petitprince/nodes/petitprince-4.yaml           | 1 +
 .../clusters/petitprince/nodes/petitprince-5.yaml           | 1 +
 .../clusters/petitprince/nodes/petitprince-6.yaml           | 1 +
 .../clusters/petitprince/nodes/petitprince-7.yaml           | 1 +
 .../clusters/petitprince/nodes/petitprince-9.yaml           | 1 +
 .../grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml | 5 +++++
 .../grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml | 5 +++++
 .../sites/lyon/clusters/hercule/nodes/hercule-1.yaml        | 3 +++
 .../sites/lyon/clusters/hercule/nodes/hercule-2.yaml        | 3 +++
 .../sites/lyon/clusters/hercule/nodes/hercule-3.yaml        | 3 +++
 .../sites/lyon/clusters/hercule/nodes/hercule-4.yaml        | 3 +++
 .../sites/lyon/clusters/neowise/nodes/neowise-1.yaml        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-10.yaml       | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-2.yaml        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-3.yaml        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-4.yaml        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-5.yaml        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-6.yaml        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-7.yaml        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-8.yaml        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-9.yaml        | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml   | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml   | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml  | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml   | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml   | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml   | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml   | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml   | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml   | 1 +
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml   | 1 +
 input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml | 1 +
 input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml | 1 +
 input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml | 1 +
 input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml | 1 +
 input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml | 2 ++
 input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml | 2 ++
 input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml | 2 ++
 input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml | 2 ++
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml  | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-10.yaml         | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-11.yaml         | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-12.yaml         | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-13.yaml         | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-15.yaml         | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-16.yaml         | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml    | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml    | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml    | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml    | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml     | 1 +
 .../sites/nancy/clusters/graoully/nodes/graoully-1.yaml     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-10.yaml    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-11.yaml    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-12.yaml    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-13.yaml    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-14.yaml    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-15.yaml    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-16.yaml    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-2.yaml     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-3.yaml     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-4.yaml     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-5.yaml     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-6.yaml     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-7.yaml     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-8.yaml     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-9.yaml     | 2 ++
 .../sites/nancy/clusters/graphique/nodes/graphique-1.yaml   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-2.yaml   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-3.yaml   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-4.yaml   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-5.yaml   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-6.yaml   | 1 +
 .../sites/nancy/clusters/graphite/nodes/graphite-1.yaml     | 2 ++
 .../sites/nancy/clusters/graphite/nodes/graphite-2.yaml     | 2 ++
 .../sites/nancy/clusters/graphite/nodes/graphite-3.yaml     | 2 ++
 .../sites/nancy/clusters/graphite/nodes/graphite-4.yaml     | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-1.yaml         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-10.yaml        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-11.yaml        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-12.yaml        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-13.yaml        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-14.yaml        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-15.yaml        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-16.yaml        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-2.yaml         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-3.yaml         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-4.yaml         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-5.yaml         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-6.yaml         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-7.yaml         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-8.yaml         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-9.yaml         | 2 ++
 .../sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml         | 1 +
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml  | 2 ++
 .../sites/nancy/clusters/grimani/nodes/grimani-1.yaml       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-2.yaml       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-3.yaml       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-4.yaml       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-5.yaml       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-6.yaml       | 1 +
 .../sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml     | 6 ++++++
 .../sites/nancy/clusters/grisou/nodes/grisou-1.yaml         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-10.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-11.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-12.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-13.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-14.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-15.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-16.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-17.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-18.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-19.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-2.yaml         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-20.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-21.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-22.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-23.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-24.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-25.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-26.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-27.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-28.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-29.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-3.yaml         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-30.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-31.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-32.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-33.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-34.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-35.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-36.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-37.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-38.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-39.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-4.yaml         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-40.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-41.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-42.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-43.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-44.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-45.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-46.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-47.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-48.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-49.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-5.yaml         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-50.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-51.yaml        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-6.yaml         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-7.yaml         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-8.yaml         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-9.yaml         | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml  | 2 ++
 .../grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml  | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml | 2 ++
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml | 2 ++
 .../sites/nancy/clusters/grouille/nodes/grouille-1.yaml     | 2 ++
 .../sites/nancy/clusters/grouille/nodes/grouille-2.yaml     | 2 ++
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml  | 1 +
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml  | 1 +
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml  | 1 +
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml  | 1 +
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml  | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml       | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-1.yaml      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-10.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-11.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-12.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-13.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-14.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-15.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-16.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-17.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-18.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-19.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-2.yaml      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-20.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-21.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-22.yaml     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-3.yaml      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-4.yaml      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-5.yaml      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-6.yaml      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-7.yaml      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-8.yaml      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-9.yaml      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml      | 1 +
 .../sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml    | 5 +++++
 .../sites/rennes/clusters/parapide/nodes/parapide-1.yaml    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-10.yaml   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-12.yaml   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-13.yaml   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-16.yaml   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-18.yaml   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-19.yaml   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-2.yaml    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-21.yaml   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-24.yaml   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-25.yaml   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-3.yaml    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-5.yaml    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-6.yaml    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-7.yaml    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-8.yaml    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-9.yaml    | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml  | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml  | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml  | 1 +
 .../sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml    | 6 ++++++
 .../sites/rennes/clusters/paravance/nodes/paravance-1.yaml  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-10.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-11.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-12.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-13.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-14.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-15.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-16.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-17.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-18.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-19.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-2.yaml  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-20.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-21.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-22.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-23.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-24.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-25.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-26.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-27.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-28.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-29.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-3.yaml  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-30.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-31.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-32.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-33.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-34.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-35.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-36.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-37.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-38.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-39.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-4.yaml  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-40.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-41.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-42.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-43.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-44.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-45.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-46.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-47.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-48.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-49.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-5.yaml  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-50.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-51.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-52.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-53.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-54.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-55.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-56.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-57.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-58.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-59.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-6.yaml  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-60.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-61.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-62.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-63.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-64.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-65.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-66.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-67.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-68.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-69.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-7.yaml  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-70.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-71.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-72.yaml | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-8.yaml  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-9.yaml  | 2 ++
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml   | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml   | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml   | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml  | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml   | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml   | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml   | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml   | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml   | 1 +
 lib/refrepo/valid/input/schemas/schema-node.yaml            | 1 +
 855 files changed, 1581 insertions(+)

diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
index 20d83e131de..4d33f00b75e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
@@ -76,6 +76,7 @@ dahu-1:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aad7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-1:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-1:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfd50"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
index e57a88dd9f3..02619c6fc1d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
@@ -76,6 +76,7 @@ dahu-10:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a9a6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-10:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b09"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-10:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59eee40"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
index 216462bf804..72c220ab8a2 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
@@ -76,6 +76,7 @@ dahu-11:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a99c"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-11:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b18"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-11:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c5a06"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
index 0a738e69de4..adec85bc265 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
@@ -76,6 +76,7 @@ dahu-12:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a9b7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-12:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b16"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-12:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f5333"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
index 5d12ee7e93a..97d26b6f36a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
@@ -76,6 +76,7 @@ dahu-13:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aadc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-13:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108c2b"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-13:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bee44"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
index a8898fbb140..624497bc65c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
@@ -76,6 +76,7 @@ dahu-14:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aade"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-14:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b54"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-14:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c855e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
index 9b6a4b804de..cdcc5dbbbfe 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
@@ -76,6 +76,7 @@ dahu-15:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aae0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-15:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c408c212f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-15:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfe44"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
index 437698e4f35..1f60298424d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
@@ -76,6 +76,7 @@ dahu-16:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aadf"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-16:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107f0a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-16:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be813"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
index 1c974aa38b3..33d67562f34 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
@@ -76,6 +76,7 @@ dahu-17:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a94d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-17:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ade"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-17:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f2445"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
index cdf697cb68d..477051bb208 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
@@ -76,6 +76,7 @@ dahu-18:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a966"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-18:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aee"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-18:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f6e03"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
index b839bc2ba02..aff44e3a4c9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
@@ -76,6 +76,7 @@ dahu-19:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a958"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-19:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107adf"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-19:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59b9b2a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
index 91b4d411d68..203691f4d45 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
@@ -76,6 +76,7 @@ dahu-2:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aad8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-2:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b06"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-2:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bf16d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
index f4fffc9e1ab..7cdc228a1ab 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
@@ -76,6 +76,7 @@ dahu-20:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a918"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-20:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ae1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-20:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c6300"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
index e7cdebfb00a..4aff0a2c7fa 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
@@ -76,6 +76,7 @@ dahu-21:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a894"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-21:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aed"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-21:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c85a2"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
index d0ac77d7aa6..879b1ec523f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
@@ -76,6 +76,7 @@ dahu-22:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a824"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-22:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-22:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bdfbc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
index e507ef9be6f..d74403be952 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
@@ -76,6 +76,7 @@ dahu-23:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a96e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-23:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b05"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-23:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be5d0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
index 19f57c848a5..fa67ba70f58 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
@@ -76,6 +76,7 @@ dahu-24:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a82d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-24:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-24:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59ba245"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
index cf9968f1067..cda4b55174f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
@@ -76,6 +76,7 @@ dahu-25:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a9ac"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-25:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ad7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-25:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a171a0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
index 217f4fabaa5..ec672fc6bdb 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
@@ -76,6 +76,7 @@ dahu-26:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a9ad"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-26:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b26"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-26:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59ed6c7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
index 83cd96f3a53..e56fa490323 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
@@ -76,6 +76,7 @@ dahu-27:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a980"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-27:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b23"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-27:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f1bfa"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
index 53d2cfdbaca..77708620039 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
@@ -76,6 +76,7 @@ dahu-28:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c406e9a4a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-28:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108792"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-28:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59baaab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
index 5ddb98b6a15..042ac6c9b8b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
@@ -76,6 +76,7 @@ dahu-29:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a98f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-29:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-29:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bb3fc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
index 76446f8fa3b..6cb3f457868 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
@@ -76,6 +76,7 @@ dahu-3:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aae1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-3:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-3:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bd027"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
index c537e99362a..2f2d1690040 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
@@ -76,6 +76,7 @@ dahu-30:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a97a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-30:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bf0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-30:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a1b937"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
index 0bd4d5622bf..ae68da9cc57 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
@@ -76,6 +76,7 @@ dahu-31:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a991"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-31:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bdd"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-31:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c90ac"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
index e06142ab32c..c29958e619e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
@@ -76,6 +76,7 @@ dahu-32:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a988"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-32:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bf1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-32:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bea5a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
index 8914724f7a5..e377145b830 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
@@ -76,6 +76,7 @@ dahu-4:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aad9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-4:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b07"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-4:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c1fa4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
index e8a26048aea..537fa1a0924 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
@@ -76,6 +76,7 @@ dahu-5:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a8d9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-5:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ad4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-5:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c0047"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
index 52505ddb655..8205d18210c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
@@ -76,6 +76,7 @@ dahu-6:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a89a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-6:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ac4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-6:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfa82"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
index 2038ab913d9..b55c872e9b3 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
@@ -76,6 +76,7 @@ dahu-7:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a8a5"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-7:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ab8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-7:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a16fb1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB32
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
index 264fe40c6ef..a088e7fe256 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
@@ -76,6 +76,7 @@ dahu-8:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a8e3"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-8:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ac7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-8:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be557"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
index 012cb5f918e..9faa1fb3e53 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
@@ -76,6 +76,7 @@ dahu-9:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a4a0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
@@ -83,6 +84,7 @@ dahu-9:
       size: 240057409536
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107cba"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
@@ -90,6 +92,7 @@ dahu-9:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c79a6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
index bb2067e255f..b686b99819c 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
@@ -156,6 +156,7 @@ drac-1:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c0fa4a5"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-1:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c18078e"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
index fc9d562667a..fe809b61220 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
@@ -156,6 +156,7 @@ drac-10:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c182ff3"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-10:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081027356"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
index 6c5d7dd6438..2d816e20858 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
@@ -156,6 +156,7 @@ drac-11:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c1828f7"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-11:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081106cbd"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
index bbf0dc452d4..e946f15ec23 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
@@ -156,6 +156,7 @@ drac-12:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c181b15"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-12:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081106db5"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
index cc439c87dc9..81cce7370d0 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
@@ -156,6 +156,7 @@ drac-2:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500811069a0"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-2:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081107893"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
index 0ce5597319f..17999696160 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
@@ -156,6 +156,7 @@ drac-3:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c1827b8"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-3:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5a66ac"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
index bd6e9e706ab..84bc65f4ecb 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
@@ -156,6 +156,7 @@ drac-4:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008110859b"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-4:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081026d3e"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
index d6d2818391c..d49745911a2 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
@@ -156,6 +156,7 @@ drac-5:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081108684"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-5:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5cb8a9"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
index 2adffda54d3..05a701eac83 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
@@ -156,6 +156,7 @@ drac-6:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c469404"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-6:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081108685"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
index 8c5a40f971a..f261d078877 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
@@ -156,6 +156,7 @@ drac-7:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5cc061"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-7:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008111f2af"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
index aa7d7ac7680..2e25630cd6f 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
@@ -156,6 +156,7 @@ drac-8:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50080dc50c9"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE32
@@ -163,6 +164,7 @@ drac-8:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008110789b"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
index b2d88443e21..a01abbc11ba 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
@@ -156,6 +156,7 @@ drac-9:
     version: 1.0
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c182b32"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
@@ -163,6 +164,7 @@ drac-9:
       size: 1000204886016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5ab80c"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
index e5f672b8b91..ce38b2cda02 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
@@ -77,12 +77,14 @@ troll-1:
     version: Gold 5218
   storage_devices:
     nvme0n1:
+      id: "disk1"
       by_id: "/dev/disk/by-id/nvme-eui.36314130522024320025384100000004"
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Ent NVMe AGN MU AIC 1.6TB
       size: 1600321314816
       storage: SSD
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075122febd94"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
index 4a8d5eb93b9..0296a07e9cb 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
@@ -77,12 +77,14 @@ troll-2:
     version: Gold 5218
   storage_devices:
     nvme0n1:
+      id: "disk1"
       by_id: "/dev/disk/by-id/nvme-eui.36314130522024170025384100000004"
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Ent NVMe AGN MU AIC 1.6TB
       size: 1600321314816
       storage: SSD
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075122feba5f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
index db9677ab901..bb2263c7b95 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
@@ -77,12 +77,14 @@ troll-3:
     version: Gold 5218
   storage_devices:
     nvme0n1:
+      id: "disk1"
       by_id: "/dev/disk/by-id/nvme-eui.36314130522024410025384100000004"
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Ent NVMe AGN MU AIC 1.6TB
       size: 1600321314816
       storage: SSD
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075122fea331"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
index 8a60922931b..975bd7971d9 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
@@ -77,12 +77,14 @@ troll-4:
     version: Gold 5218
   storage_devices:
     nvme0n1:
+      id: "disk1"
       by_id: "/dev/disk/by-id/nvme-eui.36314130522023450025384100000004"
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Ent NVMe AGN MU AIC 1.6TB
       size: 1600321314816
       storage: SSD
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075122feba61"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
index 78f07f0b184..1eb9ac68765 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -94,18 +94,21 @@ yeti-1:
     version: Gold 6130
   storage_devices:
     nvme0n1:
+      id: "disk4"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000bad"
       by_path: "/dev/disk/by-path/pci-0000:59:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     nvme1n1:
+      id: "disk5"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb3"
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414de1d705"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5A
@@ -113,6 +116,7 @@ yeti-1:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08870d7"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
@@ -120,6 +124,7 @@ yeti-1:
       size: 2000398934016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0897757"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
@@ -127,6 +132,7 @@ yeti-1:
       size: 2000398934016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0ae94bf"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
index 15481b3bbea..6482d092436 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -94,18 +94,21 @@ yeti-2:
     version: Gold 6130
   storage_devices:
     nvme0n1:
+      id: "disk4"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000baf"
       by_path: "/dev/disk/by-path/pci-0000:59:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     nvme1n1:
+      id: "disk5"
       by_id: "/dev/disk/by-id/nvme-eui.0025389571001020"
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414de16d7a"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5A
@@ -113,6 +116,7 @@ yeti-2:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08aab8f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
@@ -120,6 +124,7 @@ yeti-2:
       size: 2000398934016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a088ce2f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
@@ -127,6 +132,7 @@ yeti-2:
       size: 2000398934016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0ae06af"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
index 53b0d6e5c55..760d3284c7a 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -94,18 +94,21 @@ yeti-3:
     version: Gold 6130
   storage_devices:
     nvme0n1:
+      id: "disk4"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb6"
       by_path: "/dev/disk/by-path/pci-0000:59:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     nvme1n1:
+      id: "disk5"
       by_id: "/dev/disk/by-id/nvme-eui.002538957100101f"
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4150a22f9b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL65
@@ -113,6 +116,7 @@ yeti-3:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08a4beb"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
@@ -120,6 +124,7 @@ yeti-3:
       size: 2000398934016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a089563f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
@@ -127,6 +132,7 @@ yeti-3:
       size: 2000398934016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0adf81f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
index 013fedc8142..8530c502294 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -94,18 +94,21 @@ yeti-4:
     version: Gold 6130
   storage_devices:
     nvme0n1:
+      id: "disk4"
       by_id: "/dev/disk/by-id/nvme-eui.002538957100101b"
       by_path: "/dev/disk/by-path/pci-0000:59:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     nvme1n1:
+      id: "disk5"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb5"
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414de0fa6e"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5A
@@ -113,6 +116,7 @@ yeti-4:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08a9c6b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
@@ -120,6 +124,7 @@ yeti-4:
       size: 2000398934016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08a7bb3"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
@@ -127,6 +132,7 @@ yeti-4:
       size: 2000398934016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0ae58b3"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
index 95d315ca852..d29869a5163 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
@@ -83,6 +83,7 @@ chetemi-1:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c0d57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-1:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c06c7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
index ecaeca61c67..136ee5c9dbd 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
@@ -83,6 +83,7 @@ chetemi-10:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b82062b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: KT37
@@ -90,6 +91,7 @@ chetemi-10:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be5d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
index 95fc2a829c9..06dc85572b7 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
@@ -83,6 +83,7 @@ chetemi-11:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c34cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-11:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c29ef"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
index 218c779c1b0..f9eedde050d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
@@ -83,6 +83,7 @@ chetemi-12:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bddd7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-12:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be0d3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
index d3268392b6d..84ce0b45efe 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
@@ -83,6 +83,7 @@ chetemi-13:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c2d9b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-13:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdf6f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
index 40c03c8112f..1afab0aefe0 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
@@ -83,6 +83,7 @@ chetemi-14:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bcd6f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-14:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bacaf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
index e950e9708f6..6a27f20db59 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
@@ -83,6 +83,7 @@ chetemi-15:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982ba8e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-15:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bc92b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
index 644e89c61a7..acee8ee1368 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
@@ -83,6 +83,7 @@ chetemi-2:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bb667"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-2:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c11d3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
index 17322ea8433..88a31c67887 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
@@ -83,6 +83,7 @@ chetemi-3:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bfd7f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-3:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c2b5f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
index bb34dd42ca9..a0c04daae60 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
@@ -83,6 +83,7 @@ chetemi-4:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be717"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-4:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c1723"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
index 9b82475bdfc..6cf583951a7 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
@@ -83,6 +83,7 @@ chetemi-5:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c226b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-5:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdb03"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
index 4e6f401a3ad..1024f1e422d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
@@ -83,6 +83,7 @@ chetemi-6:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bcfff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-6:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bf523"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
index ae2d51da5ad..5dee02fb78e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
@@ -83,6 +83,7 @@ chetemi-7:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdacf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-7:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c34ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
index 84a3df9e127..d097932110a 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
@@ -83,6 +83,7 @@ chetemi-8:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c043b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-8:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c310b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
index b07b85987cf..b44f69ccb9f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
@@ -83,6 +83,7 @@ chetemi-9:
     version: E5-2630 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c0de7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
@@ -90,6 +91,7 @@ chetemi-9:
       size: 300000000000
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c1dbf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
index ed4ff9c2a88..2e1932f16c3 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
@@ -101,6 +101,7 @@ chiclet-1:
     version: 7301
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035dde9"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
@@ -108,6 +109,7 @@ chiclet-1:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eb7f7"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
@@ -115,6 +117,7 @@ chiclet-1:
       size: 4000787030016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64daa5f"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
index 89c58d1533b..ea0c4bea0bd 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
@@ -101,6 +101,7 @@ chiclet-2:
     version: 7301
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d47d"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
@@ -108,6 +109,7 @@ chiclet-2:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ef6e3"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
@@ -115,6 +117,7 @@ chiclet-2:
       size: 4000787030016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e05d7"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
index 39335aa2971..564479ce204 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
@@ -101,6 +101,7 @@ chiclet-3:
     version: 7301
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d489"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
@@ -108,6 +109,7 @@ chiclet-3:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d96f3"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
@@ -115,6 +117,7 @@ chiclet-3:
       size: 4000787030016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e26af"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
index 3fe306ea93b..031c0e37e5b 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
@@ -101,6 +101,7 @@ chiclet-4:
     version: 7301
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035dded"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
@@ -108,6 +109,7 @@ chiclet-4:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec373"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
@@ -115,6 +117,7 @@ chiclet-4:
       size: 4000787030016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d90c7"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
index 969777ba347..c4b812c94fd 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
@@ -101,6 +101,7 @@ chiclet-5:
     version: 7301
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d491"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
@@ -108,6 +109,7 @@ chiclet-5:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64dc72f"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
@@ -115,6 +117,7 @@ chiclet-5:
       size: 4000787030016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64df1eb"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
index 4019f34388e..e40151d9643 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
@@ -101,6 +101,7 @@ chiclet-6:
     version: 7301
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d435"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
@@ -108,6 +109,7 @@ chiclet-6:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d6cd3"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
@@ -115,6 +117,7 @@ chiclet-6:
       size: 4000787030016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64db00b"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
index 189b114e8a9..818f503b978 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
@@ -101,6 +101,7 @@ chiclet-7:
     version: 7301
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d479"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
@@ -108,6 +109,7 @@ chiclet-7:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e09fb"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
@@ -115,6 +117,7 @@ chiclet-7:
       size: 4000787030016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d279b"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
index e773cec2d79..39c68b99614 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
@@ -101,6 +101,7 @@ chiclet-8:
     version: 7301
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d42d"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
@@ -108,6 +109,7 @@ chiclet-8:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e0c83"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
@@ -115,6 +117,7 @@ chiclet-8:
       size: 4000787030016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec817"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
index 238419ce405..a9ac7dc76a9 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -100,6 +100,7 @@ chifflet-1:
     version: E5-2680 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a8d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
@@ -107,6 +108,7 @@ chifflet-1:
       size: 400088457216
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a68a5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
@@ -114,6 +116,7 @@ chifflet-1:
       size: 400088457216
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
@@ -121,6 +124,7 @@ chifflet-1:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973b80345a"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
index 989f6c76288..9b94723d906 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -100,6 +100,7 @@ chifflet-2:
     version: E5-2680 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a75"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
@@ -107,6 +108,7 @@ chifflet-2:
       size: 400088457216
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ad9"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
@@ -114,6 +116,7 @@ chifflet-2:
       size: 400088457216
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
@@ -121,6 +124,7 @@ chifflet-2:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e9"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
index 5a405397f75..f587342fead 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -100,6 +100,7 @@ chifflet-3:
     version: E5-2680 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ab5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
@@ -107,6 +108,7 @@ chifflet-3:
       size: 400088457216
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a99"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
@@ -114,6 +116,7 @@ chifflet-3:
       size: 400088457216
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
@@ -121,6 +124,7 @@ chifflet-3:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b54"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
index af0599095ff..02e84efc952 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -100,6 +100,7 @@ chifflet-4:
     version: E5-2680 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a68ad"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
@@ -107,6 +108,7 @@ chifflet-4:
       size: 400088457216
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac9"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
@@ -114,6 +116,7 @@ chifflet-4:
       size: 400088457216
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f2"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
@@ -121,6 +124,7 @@ chifflet-4:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e6"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
index b08c3a42211..439a21ddaeb 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -100,6 +100,7 @@ chifflet-5:
     version: E5-2680 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
@@ -107,6 +108,7 @@ chifflet-5:
       size: 400088457216
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a81"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
@@ -114,6 +116,7 @@ chifflet-5:
       size: 400088457216
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ea"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
@@ -121,6 +124,7 @@ chifflet-5:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ee"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
index 2d557a1f951..ef8b5bdead5 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -100,6 +100,7 @@ chifflet-6:
     version: E5-2680 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a79"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
@@ -107,6 +108,7 @@ chifflet-6:
       size: 400088457216
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
@@ -114,6 +116,7 @@ chifflet-6:
       size: 400088457216
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b56"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
@@ -121,6 +124,7 @@ chifflet-6:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b58"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
index 3ab10f9e7f8..d968119477b 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -100,6 +100,7 @@ chifflet-7:
     version: E5-2680 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a6891"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
@@ -107,6 +108,7 @@ chifflet-7:
       size: 400088457216
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a85"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
@@ -114,6 +116,7 @@ chifflet-7:
       size: 400088457216
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f0"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
@@ -121,6 +124,7 @@ chifflet-7:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
index a09cb9b28ac..e318a34320f 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -100,6 +100,7 @@ chifflet-8:
     version: E5-2680 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a7d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
@@ -107,6 +108,7 @@ chifflet-8:
       size: 400088457216
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a91"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
@@ -114,6 +116,7 @@ chifflet-8:
       size: 400088457216
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
@@ -121,6 +124,7 @@ chifflet-8:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e8"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
index 0cef2ea0521..ed241186e50 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
@@ -118,6 +118,7 @@ chifflot-1:
     version: Gold 6126
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b2e47"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
@@ -125,6 +126,7 @@ chifflot-1:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b5341"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
@@ -132,6 +134,7 @@ chifflot-1:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e236f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
@@ -139,6 +142,7 @@ chifflot-1:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d9e47"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
@@ -146,6 +150,7 @@ chifflot-1:
       size: 4000787030016
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e447b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
@@ -153,6 +158,7 @@ chifflot-1:
       size: 4000787030016
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64df333"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
index f691cf83893..01448975bbc 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
@@ -118,6 +118,7 @@ chifflot-2:
     version: Gold 6126
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2be265"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
@@ -125,6 +126,7 @@ chifflot-2:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b5361"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
@@ -132,6 +134,7 @@ chifflot-2:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec36b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
@@ -139,6 +142,7 @@ chifflot-2:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000039ad8128745"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: EG03
@@ -146,6 +150,7 @@ chifflot-2:
       size: 4000787030016
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eb823"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
@@ -153,6 +158,7 @@ chifflot-2:
       size: 4000787030016
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ebc97"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
index 61cb0efcc0b..88d02585330 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
@@ -118,6 +118,7 @@ chifflot-3:
     version: Gold 6126
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2be251"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
@@ -125,6 +126,7 @@ chifflot-3:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b530e"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
@@ -132,6 +134,7 @@ chifflot-3:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50000398c8213ef9"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: EG03
@@ -139,6 +142,7 @@ chifflot-3:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x50000398c8213e0d"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: EG03
@@ -146,6 +150,7 @@ chifflot-3:
       size: 4000787030016
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000398c8213b61"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: EG03
@@ -153,6 +158,7 @@ chifflot-3:
       size: 4000787030016
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000398c820eb65"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: EG03
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
index a5c664d4d08..5b5f66f50f6 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
@@ -118,6 +118,7 @@ chifflot-4:
     version: Gold 6126
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b2e81"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
@@ -125,6 +126,7 @@ chifflot-4:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b52e1"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
@@ -132,6 +134,7 @@ chifflot-4:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eabab"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
@@ -139,6 +142,7 @@ chifflot-4:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eac67"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
@@ -146,6 +150,7 @@ chifflot-4:
       size: 4000787030016
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d6557"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
@@ -153,6 +158,7 @@ chifflot-4:
       size: 4000787030016
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e4f0b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
index bae12d4c096..738403b6ecc 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
@@ -118,6 +118,7 @@ chifflot-5:
     version: Gold 6126
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b2e20"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
@@ -125,6 +126,7 @@ chifflot-5:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b52aa"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
@@ -132,6 +134,7 @@ chifflot-5:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d3fc7"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
@@ -139,6 +142,7 @@ chifflot-5:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eddeb"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
@@ -146,6 +150,7 @@ chifflot-5:
       size: 4000787030016
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d9a9b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
@@ -153,6 +158,7 @@ chifflot-5:
       size: 4000787030016
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64de323"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
index 856a47c91f4..aabd5f067a9 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
@@ -118,6 +118,7 @@ chifflot-6:
     version: Gold 6126
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b534b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
@@ -125,6 +126,7 @@ chifflot-6:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b52e6"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
@@ -132,6 +134,7 @@ chifflot-6:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e64bb"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
@@ -139,6 +142,7 @@ chifflot-6:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e195b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
@@ -146,6 +150,7 @@ chifflot-6:
       size: 4000787030016
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ecc33"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
@@ -153,6 +158,7 @@ chifflot-6:
       size: 4000787030016
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e087f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
index 3d24758821b..0d684b624bc 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
@@ -118,6 +118,7 @@ chifflot-7:
     version: Gold 6126
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b4d45"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
@@ -125,6 +126,7 @@ chifflot-7:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b4d34"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
@@ -132,6 +134,7 @@ chifflot-7:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792f38"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: KU27
@@ -139,6 +142,7 @@ chifflot-7:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000cca2697930a8"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: KU27
@@ -146,6 +150,7 @@ chifflot-7:
       size: 4000787030016
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792dd0"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: KU27
@@ -153,6 +158,7 @@ chifflot-7:
       size: 4000787030016
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792fb0"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: KU27
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
index d9aa5c804db..38f7b251215 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
@@ -118,6 +118,7 @@ chifflot-8:
     version: Gold 6126
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b4d44"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
@@ -125,6 +126,7 @@ chifflot-8:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b3de6"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
@@ -132,6 +134,7 @@ chifflot-8:
       size: 480103981056
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000cca269788468"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: KU27
@@ -139,6 +142,7 @@ chifflot-8:
       size: 4000787030016
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000cca26979314c"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: KU27
@@ -146,6 +150,7 @@ chifflot-8:
       size: 4000787030016
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792d1c"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: KU27
@@ -153,6 +158,7 @@ chifflot-8:
       size: 4000787030016
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792e7c"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: KU27
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
index c50ddc3e7ca..63d0f1d72a3 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -65,6 +65,7 @@ petitprince-1:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe1ae2c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
index 19221455778..ce81129c280 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -65,6 +65,7 @@ petitprince-10:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008bd8b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
index 19720f679b0..8f3f0a89ec1 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -65,6 +65,7 @@ petitprince-11:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008c7e3"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
index 9545de43a75..de0eaa2785e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -65,6 +65,7 @@ petitprince-13:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe19270"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
index 0fd4baba4f3..32c74eaf2da 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -65,6 +65,7 @@ petitprince-14:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe191f2"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
index 02fb1dda4a3..50cc7dd527d 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -65,6 +65,7 @@ petitprince-15:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe1b5f9"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
index 5bc0b730939..d8e3fbc3fc3 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -65,6 +65,7 @@ petitprince-16:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe1aa39"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
index a7aafe37057..1f3c750132f 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -65,6 +65,7 @@ petitprince-2:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008bb43"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
index 43c4c135311..f706aedccdc 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -65,6 +65,7 @@ petitprince-3:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008ccba"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
index ed01f5fe8fa..043da87e5d6 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -65,6 +65,7 @@ petitprince-4:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008dba0"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
index af9e2ee11e1..85340cf9bb2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -65,6 +65,7 @@ petitprince-5:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008c94d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
index 96b1af6ee70..45bbed07fe2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -65,6 +65,7 @@ petitprince-6:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008cea0"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
index 95e2b063146..45125bb3907 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -65,6 +65,7 @@ petitprince-7:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008af8c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
index 316f022db88..82d106bad3e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -65,6 +65,7 @@ petitprince-9:
     version: E5-2630L
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008bc53"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
index 2b7716bda30..d84808e1cec 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -174,6 +174,7 @@ gemini-1:
     version: E5-2698 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40be7492"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:14:0"
       firmware_version: GXM5104Q
@@ -181,6 +182,7 @@ gemini-1:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3472"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
       firmware_version: GXT5204Q
@@ -188,6 +190,7 @@ gemini-1:
       size: 1920383410176
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf346b"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
       firmware_version: GXT5204Q
@@ -195,6 +198,7 @@ gemini-1:
       size: 1920383410176
       storage: SSD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3474"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
       firmware_version: GXT5204Q
@@ -202,6 +206,7 @@ gemini-1:
       size: 1920383410176
       storage: SSD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3468"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
       firmware_version: GXT5204Q
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
index de034d9aa78..0c74b97a21b 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -174,6 +174,7 @@ gemini-2:
     version: E5-2698 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40be7442"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:14:0"
       firmware_version: GXM5104Q
@@ -181,6 +182,7 @@ gemini-2:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3462"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
       firmware_version: GXT5204Q
@@ -188,6 +190,7 @@ gemini-2:
       size: 1920383410176
       storage: SSD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3469"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
       firmware_version: GXT5204Q
@@ -195,6 +198,7 @@ gemini-2:
       size: 1920383410176
       storage: SSD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3459"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
       firmware_version: GXT5204Q
@@ -202,6 +206,7 @@ gemini-2:
       size: 1920383410176
       storage: SSD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf345b"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
       firmware_version: GXT5204Q
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
index 9a8aa9eb0ae..7b8b0278d9d 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -82,6 +82,7 @@ hercule-1:
     version: E5-2620
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b19280d4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D02
@@ -89,6 +90,7 @@ hercule-1:
       size: 2000398934016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7ce58"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
@@ -96,6 +98,7 @@ hercule-1:
       size: 2000398934016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d0f47"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
index 5da8c07c477..6adc2115b6c 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -82,6 +82,7 @@ hercule-2:
     version: E5-2620
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d0e25"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D02
@@ -89,6 +90,7 @@ hercule-2:
       size: 2000398934016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d1dc2"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
@@ -96,6 +98,7 @@ hercule-2:
       size: 2000398934016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7f10e"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
index e662e2d7754..197ee129ab5 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -82,6 +82,7 @@ hercule-3:
     version: E5-2620
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7e551"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D02
@@ -89,6 +90,7 @@ hercule-3:
       size: 2000398934016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7ff85"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
@@ -96,6 +98,7 @@ hercule-3:
       size: 2000398934016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e80cae"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
index 5c36be73393..352272e4b2a 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -82,6 +82,7 @@ hercule-4:
     version: E5-2620
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b192dd47"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D02
@@ -89,6 +90,7 @@ hercule-4:
       size: 2000398934016
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d2a85"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
@@ -96,6 +98,7 @@ hercule-4:
       size: 2000398934016
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d0180"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
index 966db62c370..d218bd04cca 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
@@ -153,6 +153,7 @@ neowise-1:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e5312830025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
index d0024e879a9..ec6cca20a4a 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
@@ -153,6 +153,7 @@ neowise-10:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e6826320025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
index 4d9f02397bb..4b2e8356da4 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
@@ -153,6 +153,7 @@ neowise-2:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304ea214240025384300000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
index 64fda588e0d..74039bd7769 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
@@ -153,6 +153,7 @@ neowise-3:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e6825260025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
index a5bddf2054f..a22e9cb011f 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
@@ -153,6 +153,7 @@ neowise-4:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e6826350025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
index 5508811b348..79bd0e4c7bc 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
@@ -153,6 +153,7 @@ neowise-5:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304ea214070025384300000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
index 9ca53f0ad8b..be4f288f9e5 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
@@ -153,6 +153,7 @@ neowise-6:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e5310840025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
index 6c70e6e991c..ae182ae1b88 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
@@ -153,6 +153,7 @@ neowise-7:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e5312770025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml
index faf2ac3ae71..bb7de96081c 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml
@@ -153,6 +153,7 @@ neowise-8:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e6826420025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
index 4fabb53e0da..4fd9a6421e2 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
@@ -153,6 +153,7 @@ neowise-9:
     version: 7642
   storage_devices:
     nvme0n1:
+      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e5312000025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
       model: SAMSUNG MZ1LB1T9HALS-00007
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
index 253e97821ff..e59c051f0cf 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
@@ -100,6 +100,7 @@ nova-1:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d53233001fa68207168d7a78"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
index c550f890b86..90c93383d76 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
@@ -100,6 +100,7 @@ nova-10:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d535c5001fa67d1b1438aaac"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
index b5f52bcc31f..b5e7b237e16 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
@@ -100,6 +100,7 @@ nova-11:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d53084001fa67d86160089a1"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
index ca10084a943..2c2861bff0c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
@@ -100,6 +100,7 @@ nova-12:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5312c001fa67da41514e86c"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
index b460db28188..ef7a9f00091 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
@@ -100,6 +100,7 @@ nova-13:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5321e001fa68240166b583d"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
index 78f403c51f0..142487f20c4 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
@@ -100,6 +100,7 @@ nova-14:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d52ffd001fa686f21554c2ef"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
index 70b1b2cabc2..31d9a113fcc 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
@@ -100,6 +100,7 @@ nova-15:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74c2c001faf7c8917427277"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
index d145f72533b..1e260939f06 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
@@ -100,6 +100,7 @@ nova-16:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74aa3001faf2fb9162bd980"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
index c078660d1ce..24db815d48a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
@@ -100,6 +100,7 @@ nova-17:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74b43001faf301d16fd06a2"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
index 8e27a6992ec..fe8697a563c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
@@ -100,6 +100,7 @@ nova-18:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74c2b001faf2d6f163a704b"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
index 7a64670e9f8..ea1fcd87e30 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
@@ -100,6 +100,7 @@ nova-19:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d532d2001faf306f1651a996"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
index 55545861da3..fbc19d52af7 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
@@ -100,6 +100,7 @@ nova-2:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5365e001fa681f6133ccb43"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
index aa0a883e811..338dc0a43b5 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
@@ -100,6 +100,7 @@ nova-20:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74b9f00234f777e59eced29"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
index 7d5df00d756..8edf60fc76b 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
@@ -100,6 +100,7 @@ nova-21:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74c1c001faf302e172ea4cc"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
index a17e6840a8b..7be02accc4a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
@@ -100,6 +100,7 @@ nova-22:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74ba6001faf2da114b597f7"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
index ff7f497c512..ac1cc46b316 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
@@ -100,6 +100,7 @@ nova-23:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74ba5001faf302615c2126a"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
index 4c3544a0556..1e335ca9924 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
@@ -100,6 +100,7 @@ nova-3:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5312b001fa67fc516a57365"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
index 78cd2608894..ca8926f8e80 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
@@ -100,6 +100,7 @@ nova-4:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5321d001fa67db113e2e912"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
index 4b6789dc122..b8068a01524 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
@@ -100,6 +100,7 @@ nova-5:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5312e001fa67d9b136639e4"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
index 09cc8952957..3948483972c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
@@ -100,6 +100,7 @@ nova-6:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d53546001fa67ff81693868b"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
index 5a0b1a3ec9a..a3e470ef3dd 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
@@ -100,6 +100,7 @@ nova-7:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74c1a001faf2d7213cbbd90"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
index 7cb4700bb46..d29244c7e87 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
@@ -100,6 +100,7 @@ nova-8:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d53639001fa682f814f62a7a"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
index 2c409c86991..383c54b6025 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
@@ -100,6 +100,7 @@ nova-9:
     version: E5-2620 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d535ed001fa67d1a12d0d135"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
index b55adee8709..4afa9a209ec 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -100,6 +100,7 @@ orion-1:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2833001797384918984fca"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
index 506f3a14e1f..f3d4ee39cee 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -100,6 +100,7 @@ orion-2:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2be9002413f44f13a048ac"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
index ea58aa187b1..e9d16752cf8 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -100,6 +100,7 @@ orion-3:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2bf10023c87a0a083708a4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
index 348f50a20d6..1e146c1d4f3 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -100,6 +100,7 @@ orion-4:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab23f80017973cc4197b7ff7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
index e23e521edcb..a576bfc86ce 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
@@ -76,6 +76,7 @@ pyxis-1:
     version: 99xx
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53de0"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0"
       firmware_version: RVT02B6Q
@@ -83,6 +84,7 @@ pyxis-1:
       size: 250059350016
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53daa"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
index bae512714b0..6b9dbc35d17 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
@@ -76,6 +76,7 @@ pyxis-2:
     version: 99xx
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53daf"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0"
       firmware_version: RVT02B6Q
@@ -83,6 +84,7 @@ pyxis-2:
       size: 250059350016
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53da8"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
index 90f4a579615..f2171093370 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
@@ -76,6 +76,7 @@ pyxis-3:
     version: 99xx
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53de9"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0"
       firmware_version: RVT02B6Q
@@ -83,6 +84,7 @@ pyxis-3:
       size: 250059350016
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53da9"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
index 18750bdb163..7773ea41a4c 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
@@ -76,6 +76,7 @@ pyxis-4:
     version: 99xx
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53dea"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0"
       firmware_version: RVT02B6Q
@@ -83,6 +84,7 @@ pyxis-4:
       size: 250059350016
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53de8"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
index 33ee536260d..1982dd5278d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
@@ -49,6 +49,7 @@ sagittaire-10:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
index a034c1401b9..a77886378a2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -64,6 +64,7 @@ sagittaire-11:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 8
       model: ST373307LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
index 53e06ab4baa..60722a9f773 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -64,6 +64,7 @@ sagittaire-12:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 8
       model: ST373307LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
index 62d044390fd..34a08da7271 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -64,6 +64,7 @@ sagittaire-13:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
index bc55f9f24da..055c4e50ac4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -64,6 +64,7 @@ sagittaire-14:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
index c3062e16b8c..21e4ccede2a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -64,6 +64,7 @@ sagittaire-15:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
index 6d5cc7d10ac..62b3ecff011 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -64,6 +64,7 @@ sagittaire-16:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
index 84651978881..2ad91b0bea8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -64,6 +64,7 @@ sagittaire-17:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 104
       model: MAT3073NC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
index 3dd80248d82..2386fb7019c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -64,6 +64,7 @@ sagittaire-18:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
index adf0db89452..d7042022e02 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -64,6 +64,7 @@ sagittaire-2:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
index abc567abc7c..65bbbe7d3ba 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -64,6 +64,7 @@ sagittaire-20:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
index 91b5f77ff35..b204371e052 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
@@ -49,6 +49,7 @@ sagittaire-21:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
index b6eb4e0fa01..91aff8716f5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
@@ -46,6 +46,7 @@ sagittaire-22:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
index 4732c6d1088..04c301f48a9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
@@ -46,6 +46,7 @@ sagittaire-23:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       model: MAT3073NC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
index ed099170043..5aa560fd0bd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
@@ -49,6 +49,7 @@ sagittaire-25:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
index fbbcf51a8c8..eb340c9ac6a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
@@ -49,6 +49,7 @@ sagittaire-26:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
index 1186f4d8148..7a4bea901d6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
@@ -49,6 +49,7 @@ sagittaire-28:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
index f618ec6ac34..8ac7f21966a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -64,6 +64,7 @@ sagittaire-3:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
index 18ff6e70a13..f4576f2c5cf 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
@@ -54,6 +54,7 @@ sagittaire-32:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
index a0882e20dbe..1920fd6a374 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
@@ -54,6 +54,7 @@ sagittaire-33:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
index 273e217c9ee..9c3b8c7350e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
@@ -54,6 +54,7 @@ sagittaire-34:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
index 8a7d10dc486..1474636b4a4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
@@ -49,6 +49,7 @@ sagittaire-35:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
index 2391595c57b..da81ad6b965 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
@@ -49,6 +49,7 @@ sagittaire-36:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
index 641674c7209..fad8135e079 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
@@ -49,6 +49,7 @@ sagittaire-37:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
index d74ef5063ea..461ead1b027 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
@@ -48,6 +48,7 @@ sagittaire-38:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
index d4f00f09a78..fb7e23d2bd1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
@@ -48,6 +48,7 @@ sagittaire-39:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
index ed45194b792..2f57798072b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -64,6 +64,7 @@ sagittaire-4:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
index 251e436591d..57f93922c32 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
@@ -48,6 +48,7 @@ sagittaire-40:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
index e52921e6959..dce2034b77e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
@@ -49,6 +49,7 @@ sagittaire-41:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
index 0a94d271487..160639f2675 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
@@ -48,6 +48,7 @@ sagittaire-42:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
index 38a5ee758c3..e7a22983485 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
@@ -54,6 +54,7 @@ sagittaire-43:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
index a4928c65f7a..00e9229aece 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
@@ -54,6 +54,7 @@ sagittaire-44:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
index a28f2ac52b0..3c64a3160bc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
@@ -46,6 +46,7 @@ sagittaire-45:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       model: MAT3073NC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
index 88bcfef6d51..5ade5ac1021 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
@@ -54,6 +54,7 @@ sagittaire-47:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
index 4a6f18d1fba..f69b3737468 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
@@ -54,6 +54,7 @@ sagittaire-48:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
index afc7887f8b4..a67f3d24fa6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
@@ -54,6 +54,7 @@ sagittaire-49:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
index 34f7306186a..1727bc8ca1c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -64,6 +64,7 @@ sagittaire-5:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
index 90fdab11ec2..07e2a5f707a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
@@ -54,6 +54,7 @@ sagittaire-50:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
index 685688501bf..506b8332a1f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
@@ -54,6 +54,7 @@ sagittaire-51:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
index caa673379f5..cadf08759d3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
@@ -52,6 +52,7 @@ sagittaire-52:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
index 30c6e2b62d8..4a7e2c0f496 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
@@ -48,6 +48,7 @@ sagittaire-53:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
index c1039d38a89..1c0fa8afed9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
@@ -48,6 +48,7 @@ sagittaire-54:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
index d358858b3c5..8f7e2de9073 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
@@ -48,6 +48,7 @@ sagittaire-55:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
index 7f23ea0ba79..74d00355271 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
@@ -48,6 +48,7 @@ sagittaire-56:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
index 24d19193dfb..ab858c978a6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
@@ -48,6 +48,7 @@ sagittaire-57:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
index cf6bf25af44..365f76dc407 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
@@ -48,6 +48,7 @@ sagittaire-58:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
index 91577b33c1a..c6217f28c59 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
@@ -48,6 +48,7 @@ sagittaire-59:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
index 497c958b0cb..d6825f3f13a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -64,6 +64,7 @@ sagittaire-6:
     version: 250
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
       model: ST373207LC
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
index 1e9a2f0487d..ffdb6ae3664 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
@@ -49,6 +49,7 @@ sagittaire-60:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
index 619fd5e61f6..992399b3429 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
@@ -48,6 +48,7 @@ sagittaire-61:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
index 660b67fde9f..90b6c57c75b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
@@ -48,6 +48,7 @@ sagittaire-62:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
index 58a180bc761..5a17f1746e2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
@@ -48,6 +48,7 @@ sagittaire-63:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
index 8f68d3e5ccc..c2b2a452a1b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
@@ -48,6 +48,7 @@ sagittaire-64:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
index 2e89b90ed92..de4f7ddbaef 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
@@ -48,6 +48,7 @@ sagittaire-65:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
index 0533f1675b6..f3ac2784326 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
@@ -48,6 +48,7 @@ sagittaire-66:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
index 3d8595d56e1..bb23e807758 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
@@ -48,6 +48,7 @@ sagittaire-67:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
index 53542827535..498ef58a895 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
@@ -49,6 +49,7 @@ sagittaire-68:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
index eafc8360ea9..5805c932b46 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
@@ -48,6 +48,7 @@ sagittaire-69:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
index 94c04979326..f6764e3c11b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
@@ -48,6 +48,7 @@ sagittaire-70:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
index 67ae2313bcf..8f86f70743b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
@@ -48,6 +48,7 @@ sagittaire-71:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
index fa865f83709..3dbb450408c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
@@ -48,6 +48,7 @@ sagittaire-72:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
index 39f4bf6c330..1233b1e795e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -49,6 +49,7 @@ sagittaire-73:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
index f24cc15fc19..1c448fac3f1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
@@ -48,6 +48,7 @@ sagittaire-74:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
index f65d95c2d72..e6e79d08aa7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
@@ -48,6 +48,7 @@ sagittaire-75:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
index ede9d183add..a2a05721c1d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
@@ -49,6 +49,7 @@ sagittaire-76:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
index f5302f8ae1c..328d81ac25f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
@@ -49,6 +49,7 @@ sagittaire-77:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: MAT3073NC
       rev: 104.0
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
index 8e6f9ab9835..46dd61fc3b3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
@@ -48,6 +48,7 @@ sagittaire-78:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2.0
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
index 8cc2f00d712..778a8985a98 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
@@ -49,6 +49,7 @@ sagittaire-79:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
index fa14b35335a..5d33544aee1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
@@ -49,6 +49,7 @@ sagittaire-8:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
index 7ce5bd0712d..1eb0e0d6e4a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
@@ -46,6 +46,7 @@ sagittaire-9:
     microcode: '0x3a'
   storage_devices:
     sda:
+      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       model: MAT3073NC
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
index 75688d4adc6..d7daba7a4c8 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -100,6 +100,7 @@ taurus-1:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520a8f749001794133a1901fbeb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
index 83d296b3ba4..f78a101b6aa 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -100,6 +100,7 @@ taurus-10:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2d71001794106618de059e"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
index c54b6c18b06..37013a21015 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -100,6 +100,7 @@ taurus-11:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab02df00179417e61a87aa8b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
index 1d71a9c7fc8..136b3b00b2a 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -100,6 +100,7 @@ taurus-12:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2dde00206e64f90adcd6db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
index 14ba9cff6ce..89fa5c10bc7 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -100,6 +100,7 @@ taurus-13:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2d7b00278996fb095bd97c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
index c73a56bbe48..3911a8fd6de 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -100,6 +100,7 @@ taurus-15:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x690b11c0fc5d890026074ba81857618f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
index 3c29b8d00f4..d7ec3a450a3 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
@@ -89,6 +89,7 @@ taurus-16:
     microcode: '0x71a'
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2dfd00237465b82e77e450"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
index 2d3c69592df..b396116674f 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -100,6 +100,7 @@ taurus-3:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2de700179413fb1a5c8553"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
index b9ab5d18020..775b6bbfd29 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -100,6 +100,7 @@ taurus-4:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab02c6001794153119121d98"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
index c3af4647367..1a08316378f 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -100,6 +100,7 @@ taurus-5:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2d7600179410c91a4000d4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
index 8eeb8c49a2f..02cfb5f9e70 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -100,6 +100,7 @@ taurus-6:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab02ea001794410a1a9ff888"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
index 6f8c1a9bef8..f39a3c89393 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -100,6 +100,7 @@ taurus-7:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2d920017940fb418668c7f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
index 006e0ca47ba..901755dfea4 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -100,6 +100,7 @@ taurus-8:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2df600266a64ef0b08c365"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
index e6de5b1355a..8bc068bba16 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -100,6 +100,7 @@ taurus-9:
     version: E5-2630
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab02d8001794204419fec70f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
index 7c31646ba6f..5809c63702f 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
@@ -115,6 +115,7 @@ graffiti-1:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aefea00024afe4c307e10af8"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
index 3be378341b7..988585dfc18 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
@@ -115,6 +115,7 @@ graffiti-10:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aee1d70024a7bff804ec6e41"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
index cd8b94e9ab0..53991b04334 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
@@ -115,6 +115,7 @@ graffiti-11:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff5e0024a7bfd604d35be4"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
index d6eeb939b31..55bd982e170 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
@@ -115,6 +115,7 @@ graffiti-12:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aee17b0024a7bff104dc6471"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
index 61d384cc296..ff9edb2726b 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
@@ -115,6 +115,7 @@ graffiti-13:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aefd8f0024a7bfe304e28a0a"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
index 5188538e5b6..f56e4fcd128 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
@@ -115,6 +115,7 @@ graffiti-2:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff430024929b4003cd51d0"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
index bee1bb84c4d..e6235b640b8 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
@@ -115,6 +115,7 @@ graffiti-3:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff440024a3cc780477d47a"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
index 0b92367077b..9f941a9388d 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
@@ -115,6 +115,7 @@ graffiti-4:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff390024a4aab5047b5f32"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
index 147242d603d..9488c87eabd 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
@@ -115,6 +115,7 @@ graffiti-5:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff410024968a9d0538bf26"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
index 9c8982f33d7..ff66a256f45 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
@@ -115,6 +115,7 @@ graffiti-6:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aefe4c0024955d700575177b"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
index 6c7d71f01b1..53dc6897930 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
@@ -115,6 +115,7 @@ graffiti-7:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff3f00249d84d7048679f0"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
index 31159e430a1..4b56e4d1f11 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
@@ -115,6 +115,7 @@ graffiti-8:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aefdcb0024a4ae6f048773e6"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
index f65fe4294db..dbd3d35520a 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
@@ -115,6 +115,7 @@ graffiti-9:
     version: Silver 4110
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff350024a7bfd004f0af67"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
index aa59b250f71..5178b696148 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -112,6 +112,7 @@ graoully-1:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5107cf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-1:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e41b51f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
index c0d98e75a4e..cc21568bc5b 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -112,6 +112,7 @@ graoully-10:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51463f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-10:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510003"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
index ce5f0a9ce47..b43e8de8d63 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -112,6 +112,7 @@ graoully-11:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510dc3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-11:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510db3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
index 195b5e74f3c..aec5c8fd9b3 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -112,6 +112,7 @@ graoully-12:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501d67"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-12:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffb43"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
index 0a7818819ef..3b59b920a30 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -112,6 +112,7 @@ graoully-13:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5025ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-13:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e46fd17"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
index 00ee84f5c60..53062021ee4 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -112,6 +112,7 @@ graoully-14:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5139cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-14:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcfcf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
index b5c672e3abd..6d6911a25d0 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -112,6 +112,7 @@ graoully-15:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5142bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-15:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffecf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
index 1e05fd86505..01111d5e3a7 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -112,6 +112,7 @@ graoully-16:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f98b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-16:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5149f3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
index 889e4488c32..2c28529ec6f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -112,6 +112,7 @@ graoully-2:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43b127"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-2:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43a327"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
index b296a471661..b57add965a3 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -112,6 +112,7 @@ graoully-3:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f97ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-3:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e823"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
index 839ee6ba2d6..e69e54afc6a 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -112,6 +112,7 @@ graoully-4:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50f9fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-4:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50db0b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
index 0c4704afea3..ffb31c7573a 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -112,6 +112,7 @@ graoully-5:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fd3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-5:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5141a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
index 17c92fdb619..9b8898acfeb 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -112,6 +112,7 @@ graoully-6:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51070b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-6:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50f367"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
index 4a416fbde83..83140815993 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -112,6 +112,7 @@ graoully-7:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5115c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-7:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51369b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
index 5d36d0a81bf..0e6b2f7a0bc 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -112,6 +112,7 @@ graoully-8:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9837"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-8:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fc813"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
index 817369616d1..13b16b75170 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -112,6 +112,7 @@ graoully-9:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e497"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -119,6 +120,7 @@ graoully-9:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5012db"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
index 1d0a19c0357..d6815d360e3 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -111,6 +111,7 @@ graphique-1:
     version: E5-2620 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6b083fe0d4f321001c1251a311fe7e14"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
index 1f9ad688e1f..e6be7f8a4c6 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -111,6 +111,7 @@ graphique-2:
     version: E5-2620 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x644a8420018050001c7e477b12eb7708"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
index 523d572d04a..f497b20f771 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -111,6 +111,7 @@ graphique-3:
     version: E5-2620 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x644a842001804c001c7e47d012cad591"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
index 9866e0dc647..d0f6529adca 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -111,6 +111,7 @@ graphique-4:
     version: E5-2620 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x644a8420018129001c7e47be1348b9b1"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
index d70b157ce56..ca725a73374 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -111,6 +111,7 @@ graphique-5:
     version: E5-2620 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6b083fe0e25cdc001c7e479d12b4ee36"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
index bc9680f25c3..2e3005a1715 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -111,6 +111,7 @@ graphique-6:
     version: E5-2620 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x644a842013b8c4001caf39ba130a14d7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
index 740854863ce..20b463f18e2 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -94,6 +94,7 @@ graphite-1:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50015178f368070b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: D201DL13
@@ -101,6 +102,7 @@ graphite-1:
       size: 300069052416
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50015178f36802ef"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
index def93c9fd90..a181d002134 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -94,6 +94,7 @@ graphite-2:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50015178f36802db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: D201DL13
@@ -101,6 +102,7 @@ graphite-2:
       size: 300069052416
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50015178f36800e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
index 03fddd3c9d1..d7dfcb0d360 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -94,6 +94,7 @@ graphite-3:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50015178f367f896"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: D201DL13
@@ -101,6 +102,7 @@ graphite-3:
       size: 300069052416
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50015178f368095e"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
index 33d90f3eea3..2184129d568 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -94,6 +94,7 @@ graphite-4:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50015178f36802eb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: D201DL13
@@ -101,6 +102,7 @@ graphite-4:
       size: 300069052416
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50015178f368041d"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
index 93918e92ac0..187e24156df 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
@@ -100,6 +100,7 @@ grappe-1:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee846f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-1:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca665883"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
index 86fe7ab26d9..826d235ffc0 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
@@ -100,6 +100,7 @@ grappe-10:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeb3be"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-10:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca664e0f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
index 2635b537996..c282394156b 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
@@ -100,6 +100,7 @@ grappe-11:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f0d585"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-11:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6661b7"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
index 99137e2bde4..e9a6a86d691 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
@@ -100,6 +100,7 @@ grappe-12:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f1fed9"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-12:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6692df"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
index 9bcac89165c..a7b9f5d6548 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
@@ -100,6 +100,7 @@ grappe-13:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee5c16"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-13:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6791ab"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
index 421f79020ac..4fb6db8fd07 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
@@ -100,6 +100,7 @@ grappe-14:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eecad9"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-14:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66774f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
index dbbb0f03432..ac02fcfe18d 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
@@ -100,6 +100,7 @@ grappe-15:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeb3dc"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-15:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca666e9b"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
index 7ee2b98f495..9f232385587 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
@@ -100,6 +100,7 @@ grappe-16:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca96"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-16:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6657df"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
index ea736a83f91..47501afde99 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
@@ -100,6 +100,7 @@ grappe-2:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeb056"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-2:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca662ebb"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
index 20dd9bab3a6..53a94910614 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
@@ -100,6 +100,7 @@ grappe-3:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca87"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-3:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6653c7"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
index fd37254da8e..5987c7f977a 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
@@ -100,6 +100,7 @@ grappe-4:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee593a"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-4:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66add7"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
index 8781fc49f6c..f8f52443452 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
@@ -100,6 +100,7 @@ grappe-5:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca8a"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-5:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca664d07"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
index 7a9a612aef8..bcfe31f51c7 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
@@ -100,6 +100,7 @@ grappe-6:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f1a33f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-6:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66a5d3"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
index 47aa39229e0..3850e99f9a3 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
@@ -100,6 +100,7 @@ grappe-7:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee59cb"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-7:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca664e87"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
index 52e038c1ab2..4c7b0033464 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
@@ -100,6 +100,7 @@ grappe-8:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca8e"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-8:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66a3ff"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
index f9e5cf9c9a5..2f7be32e059 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
@@ -100,6 +100,7 @@ grappe-9:
     version: Gold 5218R
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f14f38"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
@@ -107,6 +108,7 @@ grappe-9:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca665b7f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
index afaa59ce17c..024aca0dcec 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
@@ -76,6 +76,7 @@ grcinq-1:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50087efe115"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA0F
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
index 3fc6c6edbe9..645ffe1c892 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
@@ -76,6 +76,7 @@ grcinq-10:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208247520"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
index 7a1d0083c12..df5eea70c5a 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
@@ -76,6 +76,7 @@ grcinq-11:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cd938a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
index 53d31eff947..fa2f0fca993 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
@@ -76,6 +76,7 @@ grcinq-12:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cf5191"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
index 065f6d70633..513a77cd7d1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
@@ -76,6 +76,7 @@ grcinq-13:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208314962"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
index 28a833ba5a3..1ec10339fae 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
@@ -76,6 +76,7 @@ grcinq-14:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc2314"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
index dec70e437cc..e62d6358fb9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
@@ -76,6 +76,7 @@ grcinq-15:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208313f95"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
index c01e527fdec..117400f867f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
@@ -76,6 +76,7 @@ grcinq-16:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2083170d8"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
index 479e10e6f93..7b7810ec9ce 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
@@ -76,6 +76,7 @@ grcinq-17:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208247730"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
index 6b7f8b0210c..0bf814e2842 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
@@ -76,6 +76,7 @@ grcinq-18:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500659322ef"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA06
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
index d328df7f4a6..9fd891fd678 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
@@ -76,6 +76,7 @@ grcinq-19:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2ceaef2"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
index 688ba74ad9e..b74c991333d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
@@ -76,6 +76,7 @@ grcinq-2:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208259c90"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
index 15677a75c7c..4666a116711 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
@@ -76,6 +76,7 @@ grcinq-20:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cee7d4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
index b24efcb07ff..7e83f484ee6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
@@ -76,6 +76,7 @@ grcinq-21:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc2c28"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
index e65cc54fa66..164ad607130 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
@@ -76,6 +76,7 @@ grcinq-22:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dbf9a3"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
index 19dee07e676..c3aa2ee8699 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
@@ -76,6 +76,7 @@ grcinq-23:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2083161d6"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
index 695f0bd3055..77aadbdf117 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
@@ -76,6 +76,7 @@ grcinq-24:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc001d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
index 2322b1b6ac2..24c4ac9323b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
@@ -76,6 +76,7 @@ grcinq-25:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d868c64"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
index 76df838dd51..2e0ba2a0b63 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
@@ -76,6 +76,7 @@ grcinq-26:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d775fd3"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
index d63d44f9d72..61899a7df28 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
@@ -76,6 +76,7 @@ grcinq-27:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208313898"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
index 5c452f8ad73..5399192c2e2 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
@@ -76,6 +76,7 @@ grcinq-28:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d797854"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
index 73e3b92d2d7..b1bbab84c99 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
@@ -76,6 +76,7 @@ grcinq-29:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2ce20d1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
index 23166458b99..24dd678bff8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
@@ -76,6 +76,7 @@ grcinq-3:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2d18aac"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
index 987f9c3102f..79e7cabb0b5 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
@@ -76,6 +76,7 @@ grcinq-30:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50092453590"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA10
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
index db0ad2d1a52..964ab8c877b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
@@ -76,6 +76,7 @@ grcinq-31:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee20824212d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
index c79073e5b43..0f0b7ebca48 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
@@ -76,6 +76,7 @@ grcinq-32:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2c4db06"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
index f494eff60b4..d8dd6fcdafd 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
@@ -76,6 +76,7 @@ grcinq-33:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2083156f7"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
index 50423ad848f..3829473110c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
@@ -76,6 +76,7 @@ grcinq-34:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d866c80"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
index 1a5f3ea46c8..bed4733f268 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
@@ -76,6 +76,7 @@ grcinq-35:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cf5b39"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
index 3f270de7fef..6ad38d7ed51 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
@@ -76,6 +76,7 @@ grcinq-36:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cf0b6a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
index 571b2e8ad5c..f16d4128757 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
@@ -76,6 +76,7 @@ grcinq-37:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d868aef"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
index 724a661f90b..f612a2b38d3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
@@ -76,6 +76,7 @@ grcinq-38:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208314bc1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
index 50b6d51daa7..c487fb72d3d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
@@ -76,6 +76,7 @@ grcinq-39:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc0a00"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
index 6bcc9a7b57f..4f40c1431bc 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
@@ -76,6 +76,7 @@ grcinq-4:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d790253"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
index 86aace2ea7f..d43501b8050 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
@@ -76,6 +76,7 @@ grcinq-40:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208314d3b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
index 2b94a6598e7..3acc1d2adb9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
@@ -76,6 +76,7 @@ grcinq-41:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d86771f"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
index 744f7888696..b3bcffdba21 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
@@ -76,6 +76,7 @@ grcinq-42:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee20831444a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
index 0753a8afb7a..510a32930d1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
@@ -76,6 +76,7 @@ grcinq-43:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc1784"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
index dd31d84acda..009bf2e8c7b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
@@ -76,6 +76,7 @@ grcinq-44:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208313f9a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
index 7170b781b2b..f9dae20f62e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
@@ -76,6 +76,7 @@ grcinq-45:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee20823da5d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
index 3b47923e133..eab7d2450f7 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
@@ -76,6 +76,7 @@ grcinq-46:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50092454854"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA10
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
index e3b9951e5ce..cc12789266f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
@@ -76,6 +76,7 @@ grcinq-47:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d79a099"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
index 14a1051122a..ba994eee637 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
@@ -76,6 +76,7 @@ grcinq-5:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50092f6a804"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA10
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
index eace057bce7..6fa412ea6b9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
@@ -76,6 +76,7 @@ grcinq-6:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208243d9c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
index 22d42c82937..87ea65ddf59 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
@@ -76,6 +76,7 @@ grcinq-7:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208238864"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
index d36f35bd06a..dfaee4c1315 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
@@ -76,6 +76,7 @@ grcinq-8:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50090f7b98a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA0F
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
index a274927a3ba..a054015e9a4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
@@ -76,6 +76,7 @@ grcinq-9:
     version: E5-2650
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d79b6e9"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
index fa0e90194e4..401e025008e 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
@@ -111,6 +111,7 @@ grele-1:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed290020f0ff3b04942750"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-1:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed290020f0ff3c049eabaa"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
index 763b6b4db34..1290a55251e 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
@@ -111,6 +111,7 @@ grele-10:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed620020f1032d04bba445"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-10:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed620020f1032e04c5f7ae"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
index bf2c6886909..b171f2b41cf 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
@@ -111,6 +111,7 @@ grele-11:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4a0020f1032c04b9cf50"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-11:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4a0020f1032d04c9185d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
index f6db2b0a36e..45f4ea0b91e 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
@@ -111,6 +111,7 @@ grele-12:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4e0020f1032d04b82e62"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-12:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4e0020f1032d04c2acf4"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
index 09a3987bfef..f2b0c81ebca 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
@@ -111,6 +111,7 @@ grele-13:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed730020f1032d04bb5a42"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-13:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed730020f1032e04caaa9d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
index 5e8cc8c08f0..9c28338a1f0 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
@@ -111,6 +111,7 @@ grele-14:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed690020f1032d04b81a70"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-14:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed690020f1032d04c25600"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
index 529f43f1e6b..c42847c06ef 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
@@ -111,6 +111,7 @@ grele-2:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed2a0020f1032a048f9578"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-2:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed2a0020f1032b049a2ad8"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
index ed89bfdf0c6..1f986a963fe 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
@@ -111,6 +111,7 @@ grele-3:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6f0020f1032c04bd15c6"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-3:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6f0020f1032d04cc530a"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
index 07ff65b68c2..9fda9ffeb5a 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
@@ -111,6 +111,7 @@ grele-4:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d5f0020f1032d04be1041"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-4:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d5f0020f1032e04c8712e"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
index 4106afe0ea9..7902812d952 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
@@ -111,6 +111,7 @@ grele-5:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4d0020f1032c04b8def7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-5:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4d0020f1032d04c354fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
index 288cc97fd39..5ca5a9931f3 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
@@ -111,6 +111,7 @@ grele-6:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d450020f1032c04bdd746"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-6:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d450020f1032d04c8387e"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
index fab2e9e1b9e..a21f1a58e97 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
@@ -111,6 +111,7 @@ grele-7:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4a0020f1032d04c19f7c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-7:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4a0020f1032e04cc2521"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
index 54cc752496d..f1796f863d1 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
@@ -111,6 +111,7 @@ grele-8:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5edaa0020f1032d04c034d0"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-8:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5edaa0020f1032e04ca950d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
index 4c9ca61e35c..095cfe9664a 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
@@ -111,6 +111,7 @@ grele-9:
     version: E5-2650 v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6d0020f1032d04c3c44f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
@@ -118,6 +119,7 @@ grele-9:
       size: 299439751168
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6d0020f1032d04ce0efe"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
index 40fe3b55fda..c0991a0a264 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
@@ -111,6 +111,7 @@ grimani-1:
     version: E5-2603 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd09959"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
index 7c1f495ed87..ab84da8a90b 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
@@ -111,6 +111,7 @@ grimani-2:
     version: E5-2603 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd09a85"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
index 1f74eb6685f..edbebbe9a6a 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
@@ -111,6 +111,7 @@ grimani-3:
     version: E5-2603 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd099ab"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
index c6fee018a4d..6c7650cf133 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
@@ -111,6 +111,7 @@ grimani-4:
     version: E5-2603 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd0b9ae"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
index 1d1f8a4c1c3..e8289798d88 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
@@ -111,6 +111,7 @@ grimani-5:
     version: E5-2603 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd0bade"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
index 5e29a7b5ba7..fef93b23fb6 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
@@ -111,6 +111,7 @@ grimani-6:
     version: E5-2603 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd0b091"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
index 59f21cd3abb..8bad160579d 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -115,6 +115,7 @@ grimoire-1:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514393"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grimoire-1:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9ad7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
@@ -129,6 +131,7 @@ grimoire-1:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9eb3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
@@ -136,6 +139,7 @@ grimoire-1:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f88af"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
@@ -143,6 +147,7 @@ grimoire-1:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4df"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
@@ -150,6 +155,7 @@ grimoire-1:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d4"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
index cbd1ed6c2bf..87e6d2ece55 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -115,6 +115,7 @@ grimoire-2:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501987"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grimoire-2:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fd00f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
@@ -129,6 +131,7 @@ grimoire-2:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f92df"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
@@ -136,6 +139,7 @@ grimoire-2:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f948f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
@@ -143,6 +147,7 @@ grimoire-2:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9127"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
@@ -150,6 +155,7 @@ grimoire-2:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d0"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
index e5566e3dbd5..dfce70abf94 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -115,6 +115,7 @@ grimoire-3:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514093"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grimoire-3:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513acb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
@@ -129,6 +131,7 @@ grimoire-3:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d657"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
@@ -136,6 +139,7 @@ grimoire-3:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513eb3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
@@ -143,6 +147,7 @@ grimoire-3:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b07"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
@@ -150,6 +155,7 @@ grimoire-3:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa284"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
index f8d2558fb7b..3554fe690ea 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -115,6 +115,7 @@ grimoire-4:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513a33"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grimoire-4:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5261db"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
@@ -129,6 +131,7 @@ grimoire-4:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dd57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
@@ -136,6 +139,7 @@ grimoire-4:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e500297"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
@@ -143,6 +147,7 @@ grimoire-4:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5013af"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
@@ -150,6 +155,7 @@ grimoire-4:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa634"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
index de13e6d247b..5673b33dfd3 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -115,6 +115,7 @@ grimoire-5:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fa3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grimoire-5:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f7b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
@@ -129,6 +131,7 @@ grimoire-5:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50ea43"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
@@ -136,6 +139,7 @@ grimoire-5:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51440b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
@@ -143,6 +147,7 @@ grimoire-5:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51465f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
@@ -150,6 +155,7 @@ grimoire-5:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa61c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
index e6a8f718fbb..28256179129 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -115,6 +115,7 @@ grimoire-6:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f8dff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grimoire-6:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f920f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
@@ -129,6 +131,7 @@ grimoire-6:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9bf3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
@@ -136,6 +139,7 @@ grimoire-6:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f99c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
@@ -143,6 +147,7 @@ grimoire-6:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fa8ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
@@ -150,6 +155,7 @@ grimoire-6:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2b0"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
index 5a3494e9085..c7a518ec7de 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -115,6 +115,7 @@ grimoire-7:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50da03"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grimoire-7:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50cd8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
@@ -129,6 +131,7 @@ grimoire-7:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501393"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
@@ -136,6 +139,7 @@ grimoire-7:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
@@ -143,6 +147,7 @@ grimoire-7:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501a77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
@@ -150,6 +155,7 @@ grimoire-7:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa608"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
index 52d8bda67cc..0854d7e76ec 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -115,6 +115,7 @@ grimoire-8:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e509233"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grimoire-8:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f8777"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
@@ -129,6 +131,7 @@ grimoire-8:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcff7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
@@ -136,6 +139,7 @@ grimoire-8:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51004b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
@@ -143,6 +147,7 @@ grimoire-8:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9f5f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
@@ -150,6 +155,7 @@ grimoire-8:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa65c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
index 147e05028eb..df5cfa07fd0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -104,6 +104,7 @@ grisou-1:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513d3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-1:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510fe7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
index 147e1bafb79..042be8720da 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -104,6 +104,7 @@ grisou-10:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514a3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-10:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5145c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
index a2b630a7b71..3eec2ce1e4e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -104,6 +104,7 @@ grisou-11:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50ee8b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-11:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514357"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
index c47f9cb8ed9..1c90b83c99c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -104,6 +104,7 @@ grisou-12:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513917"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-12:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51467f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
index 09a01fb4f7a..6f0cd16fd11 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -104,6 +104,7 @@ grisou-13:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fe8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-13:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fdd3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
index 8edb5c9e842..359798c74d8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -104,6 +104,7 @@ grisou-14:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43ac97"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-14:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff643"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
index 3e7bb59f560..27c46d2dd61 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -104,6 +104,7 @@ grisou-15:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43beaf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-15:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4facaf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
index 17b12b15fb0..0844ebaebca 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -104,6 +104,7 @@ grisou-16:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513ddb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-16:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5135bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
index 176860990c7..6c16283a54b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -104,6 +104,7 @@ grisou-17:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5113d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-17:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510877"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
index 0fe99376e57..79a6a31a21c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -104,6 +104,7 @@ grisou-18:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5132cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-18:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51125f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
index d6411d97161..9940b495aba 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -104,6 +104,7 @@ grisou-19:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50df07"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-19:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5116e3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
index 3b07686f3b4..ed2c13e480c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -104,6 +104,7 @@ grisou-2:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51428b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-2:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510857"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
index b9bf9872800..b218181633c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -104,6 +104,7 @@ grisou-20:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51448f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-20:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dbdb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
index 553ed0e3c3a..32cd418bd95 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -104,6 +104,7 @@ grisou-21:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5145eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-21:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e511057"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
index 0f1e5a5bc81..ed64ee64c73 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -104,6 +104,7 @@ grisou-22:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5141b3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-22:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51199b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
index c7cc6d4b5d4..671cc327890 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -104,6 +104,7 @@ grisou-23:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43b8a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-23:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43c0ef"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
index 53e10bf6773..d194a87d14e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -104,6 +104,7 @@ grisou-24:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e439c87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-24:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff27f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
index de7c3bed1ad..0528f283c87 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -104,6 +104,7 @@ grisou-25:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50280f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-25:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e473563"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
index ec7ec4f0715..9b25b07b919 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -104,6 +104,7 @@ grisou-26:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e47b26f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-26:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50105b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
index 40f96e671bd..30ff3619944 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -104,6 +104,7 @@ grisou-27:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5027bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-27:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50198f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
index d8652c3b623..d251492f7f6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -104,6 +104,7 @@ grisou-28:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e502353"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-28:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5014e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
index 8181dd95d90..0105c053fff 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -104,6 +104,7 @@ grisou-29:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5015cf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-29:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50163f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
index ee66a99989d..c45908f205d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -104,6 +104,7 @@ grisou-3:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e511757"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-3:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513487"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
index d9cdef6c8ec..1ec3b2df5cf 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -104,6 +104,7 @@ grisou-30:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e52618f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-30:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e522faf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
index a173b9d538b..c77ddc96282 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -104,6 +104,7 @@ grisou-31:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e41a743"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-31:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffa5b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
index 839becb4873..75162902f5b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -104,6 +104,7 @@ grisou-32:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e527"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-32:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43bdd3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
index 98f8d2fd4c8..8046cb30d61 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -104,6 +104,7 @@ grisou-33:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff507"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-33:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
index db64073b8f0..9b16e32e457 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -104,6 +104,7 @@ grisou-34:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501663"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-34:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50129b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
index c0f223d3067..7c1ed19f3f5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -104,6 +104,7 @@ grisou-35:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e525903"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-35:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d963"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
index 070659c9767..a432559bfe4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -104,6 +104,7 @@ grisou-36:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5147fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-36:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51061b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
index af601df68d2..fbe8416ddc4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -104,6 +104,7 @@ grisou-37:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513c57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-37:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51395b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
index a88b925770c..ad30b201720 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -104,6 +104,7 @@ grisou-38:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f0f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-38:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5105bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
index 53d959fc13a..56b0e0d3ea0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -104,6 +104,7 @@ grisou-39:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513c87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-39:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e667"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
index e5e9831c46d..705fe0aaeaa 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -104,6 +104,7 @@ grisou-4:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514363"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-4:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510bff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
index 1dab14b5166..b05dc176f43 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -104,6 +104,7 @@ grisou-40:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510833"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-40:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513bcb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
index 35b8d6f37df..3ddb43bb2d1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -104,6 +104,7 @@ grisou-41:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fc7eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-41:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fcab"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
index efd291534f0..f40d0b1fce9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -104,6 +104,7 @@ grisou-42:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e44d1b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-42:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5147bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
index 33a71555d4a..6c9d4804ac3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -104,6 +104,7 @@ grisou-43:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5106e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-43:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5110db"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
index 33c610e35cb..7d797a32256 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -104,6 +104,7 @@ grisou-44:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51423b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-44:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51113f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
index c022b1776be..9873f02f0fe 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -104,6 +104,7 @@ grisou-45:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fcbb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-45:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513663"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
index 942a8d203ba..37edc82c499 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -104,6 +104,7 @@ grisou-46:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d49f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-46:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501c8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
index f7e73897d78..6444a9ac85d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -104,6 +104,7 @@ grisou-47:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43bedb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-47:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5012b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
index 21438a5f352..5af426438a6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -104,6 +104,7 @@ grisou-48:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e41e64b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-48:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d16f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
index 695c416e719..9b36bfa9242 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -103,6 +103,7 @@ grisou-49:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43b94b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -110,6 +111,7 @@ grisou-49:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4396e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
index bdfc26083c7..3c1876eaa89 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -104,6 +104,7 @@ grisou-5:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff45f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-5:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510b1b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
index 08ad51083be..418c576041e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -115,6 +115,7 @@ grisou-50:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e807"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grisou-50:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b17"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
index 47f5fc3c334..3edcf04477a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -115,6 +115,7 @@ grisou-51:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50db87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -122,6 +123,7 @@ grisou-51:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcd27"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
index 7c7ab586275..b4de5041d90 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -104,6 +104,7 @@ grisou-6:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50f8a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-6:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dc67"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
index 20cdf9ee909..915ff512ba7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -104,6 +104,7 @@ grisou-7:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50eb33"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-7:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
index 992863d7e62..205d71ecb47 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -104,6 +104,7 @@ grisou-8:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fa93"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-8:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510883"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
index 8d7de7705c0..524bd19b2d6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -104,6 +104,7 @@ grisou-9:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5107b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
@@ -111,6 +112,7 @@ grisou-9:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51017f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
index 7324d797e54..5b9006c3d01 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
@@ -65,6 +65,7 @@ gros-1:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45cda"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-1:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49235"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
index 02e865e24bd..06dc3062ade 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
@@ -65,6 +65,7 @@ gros-10:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49072"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-10:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49344"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
index 830035ae6c5..c22c62a3066 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
@@ -65,6 +65,7 @@ gros-100:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9dca"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-100:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482a3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
index 9f47b512b79..b75130974e2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
@@ -65,6 +65,7 @@ gros-101:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e4e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-101:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4831f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
index 924ccb2ced9..4667eb61ad1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
@@ -65,6 +65,7 @@ gros-102:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45e37"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-102:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f72"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
index fca817e4342..d53b58915d2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
@@ -65,6 +65,7 @@ gros-103:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45de9"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-103:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f3f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
index dec33c62176..345268a4dfe 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
@@ -65,6 +65,7 @@ gros-104:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45d12"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-104:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f94"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
index ffcea18070f..823beec7f0f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
@@ -65,6 +65,7 @@ gros-105:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbabec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-105:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483e5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
index 3ca776114de..0e61f8a3989 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
@@ -65,6 +65,7 @@ gros-106:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9da5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-106:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48491"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
index 94b89bac681..b3b980db688 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
@@ -65,6 +65,7 @@ gros-107:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac5c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-107:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48230"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
index 75ed4e0646e..408aee6abdf 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
@@ -65,6 +65,7 @@ gros-108:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45d27"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-108:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121504cdc"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
index 72adba0d07f..59cc6bed9d7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
@@ -65,6 +65,7 @@ gros-109:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba682"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-109:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4aa84"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
index e1068a758ae..14eb2e3ecc1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
@@ -65,6 +65,7 @@ gros-11:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45c17"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-11:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121503a68"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
index 6592bc04f66..197b1ab5802 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
@@ -65,6 +65,7 @@ gros-110:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba6c8"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-110:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab3e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
index 4cc689c297a..a11644845ee 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
@@ -65,6 +65,7 @@ gros-111:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba8c4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-111:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ac1c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
index 590b352c671..473be0446b8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
@@ -65,6 +65,7 @@ gros-112:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba687"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-112:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab50"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
index dd573d36791..45af6bfd6a5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
@@ -65,6 +65,7 @@ gros-113:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba8b5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-113:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4abfe"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
index e43a54552c2..caea89adfa5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
@@ -65,6 +65,7 @@ gros-114:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48123"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-114:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab04"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
index f4a46396966..9e14cd90e26 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
@@ -65,6 +65,7 @@ gros-115:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4a7f1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-115:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48793"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
index 15e57d871ea..adc138f8397 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
@@ -65,6 +65,7 @@ gros-116:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4a864"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-116:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a487ef"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
index 7922816b7df..79b4250026a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
@@ -65,6 +65,7 @@ gros-117:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb4d1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-117:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a488cd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
index a5e94566ea0..ca0dd6ae8ba 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
@@ -65,6 +65,7 @@ gros-118:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb421"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-118:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48e77"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
index 2970cd3e79c..7ff046be211 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
@@ -65,6 +65,7 @@ gros-119:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb4f8"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-119:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a24"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
index 92851284e26..d9a0953de04 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
@@ -65,6 +65,7 @@ gros-12:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4911b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-12:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a492e5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
index e80b1531a3b..4c072f06418 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
@@ -65,6 +65,7 @@ gros-120:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb3d9"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-120:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a03"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
index 1cc440c6a78..f3d54e90f66 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
@@ -65,6 +65,7 @@ gros-121:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb48f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-121:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a56"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
index 58df58b34a3..5b1d5bceaea 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
@@ -65,6 +65,7 @@ gros-122:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb408"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-122:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a489b4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
index e3ee0a596ee..eaa7c61eadd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
@@ -65,6 +65,7 @@ gros-123:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb490"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-123:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48eab"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
index a9d251a2c96..de2c0aad6c5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
@@ -65,6 +65,7 @@ gros-124:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb593"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-124:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a02"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
index c7864a87221..d4e7c3f2474 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
@@ -65,6 +65,7 @@ gros-13:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4935f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-13:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a0751215033c4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
index a2b4767f296..c6f6f14a447 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
@@ -65,6 +65,7 @@ gros-14:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e492a0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-14:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49251"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
index a0af45db27f..4ce4bd887a3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
@@ -65,6 +65,7 @@ gros-15:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49116"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-15:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a490ec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
index 9fdd2d9e77c..e9866e999eb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
@@ -65,6 +65,7 @@ gros-16:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d1f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-16:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f76"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
index 232947eb38a..79d26c6c8e8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
@@ -65,6 +65,7 @@ gros-17:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d0d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-17:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47fa2"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
index 9eeedc27603..e93072270fc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
@@ -65,6 +65,7 @@ gros-18:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9c9a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-18:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48215"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
index 2a5dfa35128..36f5e966a64 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
@@ -65,6 +65,7 @@ gros-19:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9c8f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-19:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47eab"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
index 29ed789c138..5a64a70a352 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
@@ -65,6 +65,7 @@ gros-2:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45b85"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-2:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49089"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
index b314bfe39d1..bd89b129150 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
@@ -65,6 +65,7 @@ gros-20:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9cb4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-20:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f3e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
index 825b03437a6..9150e70bcc0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
@@ -65,6 +65,7 @@ gros-21:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9288"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-21:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b5b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
index 0e30e94d0b5..19842cc1b8f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
@@ -65,6 +65,7 @@ gros-22:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb5a6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-22:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a0751215042ac"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
index 8c699f9fd1f..9726dd3313b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
@@ -65,6 +65,7 @@ gros-23:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48164"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-23:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4abec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
index cc2d9ffae63..e9e73d080ab 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
@@ -65,6 +65,7 @@ gros-24:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb4e9"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-24:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a0751215040bb"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
index d5c32a857ae..a28fba98ca4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
@@ -65,6 +65,7 @@ gros-25:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb21c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-25:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121504b66"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
index 2f56ac4bb04..5b359e4db20 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
@@ -65,6 +65,7 @@ gros-26:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db949b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-26:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49a43"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
index e3865a0ca39..4510cee2600 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
@@ -65,6 +65,7 @@ gros-27:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db945e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-27:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49aa6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
index a38dcbe4bfd..968be0e7f03 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
@@ -65,6 +65,7 @@ gros-28:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9436"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-28:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49a3a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
index 58cf799b89f..7ba2969a3b1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
@@ -65,6 +65,7 @@ gros-29:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db94a0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-29:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121509965"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
index f0c8bd36a61..ea41f1df5b1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
@@ -65,6 +65,7 @@ gros-3:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e481b7"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-3:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad83"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
index 9dc0000058c..a4a27bb8098 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
@@ -65,6 +65,7 @@ gros-30:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db92d9"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-30:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b6c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
index 2f64bce9663..d8e9938ce80 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
@@ -65,6 +65,7 @@ gros-31:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba6af"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-31:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab2b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
index a3d2e40a300..01dc3774da3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
@@ -65,6 +65,7 @@ gros-32:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba956"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-32:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ac80"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
index 9922fc99cb3..b07b648ee13 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
@@ -65,6 +65,7 @@ gros-33:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e60"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-33:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48327"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
index 900e2fb74c8..d3bb0daf806 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
@@ -65,6 +65,7 @@ gros-34:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e46"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-34:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48249"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
index 63a764878c3..e57bddc82b3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
@@ -65,6 +65,7 @@ gros-35:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9da3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-35:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482a4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
index 7d869b01647..b29dac0214a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
@@ -65,6 +65,7 @@ gros-36:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9dc2"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-36:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482a0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
index a2a3fcddb4f..db8fa9039d0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
@@ -65,6 +65,7 @@ gros-37:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac1f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-37:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4831e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
index 87d2580d15c..1a412c6dab8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
@@ -65,6 +65,7 @@ gros-38:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45c34"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-38:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48ed6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
index 6a57b962c8f..2771b705543 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
@@ -65,6 +65,7 @@ gros-39:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba675"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-39:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a488ce"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
index eb198744f3a..be979c6cb82 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
@@ -65,6 +65,7 @@ gros-4:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb422"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-4:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a4e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
index e9d20c1043a..e8b098afd0b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
@@ -65,6 +65,7 @@ gros-40:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb474"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-40:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48eb5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
index 094ce2a3f39..4110a10da2b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
@@ -65,6 +65,7 @@ gros-41:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e8e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-41:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a0751215099a6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
index 692be3c4a96..18324769cef 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
@@ -65,6 +65,7 @@ gros-42:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba006"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-42:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b99"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
index 2d7d36b1b61..609cdd0fed3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
@@ -65,6 +65,7 @@ gros-43:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45cae"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-43:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49159"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
index 54ae488a55d..4da9bb43c54 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
@@ -65,6 +65,7 @@ gros-44:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45b7f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-44:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49160"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
index 5e1236668bc..5b0ed88fbac 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
@@ -65,6 +65,7 @@ gros-45:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49090"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-45:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121504ad1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
index 57aa08c1284..bf1b7e828bb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
@@ -65,6 +65,7 @@ gros-46:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48eee"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-46:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121504b81"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
index 0c7a596a19e..6143bb37995 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
@@ -65,6 +65,7 @@ gros-47:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbabf1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-47:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121503f48"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
index 9c8dec6d648..d3c1b05fa0f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
@@ -65,6 +65,7 @@ gros-48:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48ed2"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-48:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49247"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
index f61cb38755f..ba52191ddd4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
@@ -65,6 +65,7 @@ gros-49:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45c16"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-49:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49146"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
index 4ab0dcbeeb4..28eee5c7b90 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
@@ -65,6 +65,7 @@ gros-5:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e481ec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-5:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad4d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
index fa2908ba255..98b5a067b92 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
@@ -65,6 +65,7 @@ gros-50:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e491ca"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-50:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4912f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
index 3971f6b521e..0840c797d94 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
@@ -65,6 +65,7 @@ gros-51:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4919e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-51:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4911f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
index db8bb870ccf..5dd940c5c95 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
@@ -65,6 +65,7 @@ gros-52:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba8ba"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-52:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ac25"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
index 26953ae4544..ccaecc3d044 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
@@ -65,6 +65,7 @@ gros-53:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba6dd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-53:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a489e0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
index 3aeb72f5a4e..63ff1d4804d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
@@ -65,6 +65,7 @@ gros-54:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba8a5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-54:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4acb5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
index 728629ebbbe..c30813536a9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
@@ -65,6 +65,7 @@ gros-55:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e490ce"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-55:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49120"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
index a20d9ad7875..d29a9b8858d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
@@ -65,6 +65,7 @@ gros-56:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb4b3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-56:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a07512150439a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
index 74c11d08ce7..48fd49e2eba 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
@@ -65,6 +65,7 @@ gros-57:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb5df"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-57:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a0751215040c6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
index d507c08d973..43f93e6a6cc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
@@ -65,6 +65,7 @@ gros-58:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba5cd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-58:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a07512150349d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
index b05dbfa5d27..842e4a42311 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
@@ -65,6 +65,7 @@ gros-59:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48ee6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-59:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121504b08"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
index d57980f4992..d1968f53004 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
@@ -65,6 +65,7 @@ gros-6:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4a646"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-6:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48e1b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
index 30f116b0b25..9c8b919f983 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
@@ -65,6 +65,7 @@ gros-60:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb29b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-60:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a492d4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
index ad2486ca547..493ed93b866 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
@@ -65,6 +65,7 @@ gros-61:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d8b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-61:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48430"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
index 96f4f1f1aef..a718aa0d8c9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
@@ -65,6 +65,7 @@ gros-62:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac58"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-62:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48526"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
index 89f52a865b3..dce8c9100d3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
@@ -65,6 +65,7 @@ gros-63:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbabcd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-63:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4847d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
index e0b64aa0f3a..b43869e90aa 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
@@ -65,6 +65,7 @@ gros-64:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49251"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-64:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48ede"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
index db0e4f8498a..da6d4431428 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
@@ -65,6 +65,7 @@ gros-65:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4911c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-65:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49332"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
index 2deeec4b38a..dd4ecc01365 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
@@ -65,6 +65,7 @@ gros-66:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49287"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-66:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a492ff"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
index e40c61ee4a5..d7221947ac4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
@@ -65,6 +65,7 @@ gros-67:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e491a4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-67:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49314"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
index c169b4a648e..7c84b9a76bd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
@@ -65,6 +65,7 @@ gros-68:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45cb8"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-68:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e41522c8439"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: XCV1DL67
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
index 6332e54d135..6e8b073298b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
@@ -65,6 +65,7 @@ gros-69:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac5d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-69:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48472"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
index 6fa47339ed6..ce742003bf2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
@@ -65,6 +65,7 @@ gros-7:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e490db"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-7:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121504a75"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
index 0cddf72533e..7e82322f27e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
@@ -65,6 +65,7 @@ gros-70:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac20"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-70:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48539"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
index f2060b47331..62370cbb9e2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
@@ -65,6 +65,7 @@ gros-71:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac8a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-71:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483ad"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
index cd46e3501d2..3e11fca0905 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
@@ -65,6 +65,7 @@ gros-72:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac70"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-72:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483d4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
index 1f302ce0a90..2bc03f692cc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
@@ -65,6 +65,7 @@ gros-73:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45e41"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-73:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f82"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
index 8e0ed009362..20e594c14fc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
@@ -65,6 +65,7 @@ gros-74:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45c05"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-74:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f40"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
index 584c72cb372..460be62e02c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
@@ -65,6 +65,7 @@ gros-75:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49281"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-75:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4925d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
index 7adddb7fee2..702bb59e485 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
@@ -65,6 +65,7 @@ gros-76:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48eb0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-76:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49116"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
index 409d744aeee..7c5062e956c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
@@ -65,6 +65,7 @@ gros-77:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9f9d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-77:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121509944"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
index dd1669e803b..a298a43035e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
@@ -65,6 +65,7 @@ gros-78:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba004"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-78:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121509956"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
index 354d445d40b..f83ba4c2a8d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
@@ -65,6 +65,7 @@ gros-79:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e86"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-79:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a07512150991a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
index 3151002ccef..9592691f81d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
@@ -65,6 +65,7 @@ gros-8:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49145"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-8:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4929c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
index 3b2852a5588..9f541c82e9d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
@@ -65,6 +65,7 @@ gros-80:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9eba"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-80:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a0751215099a3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
index ef5732c4404..8dd1611471a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
@@ -65,6 +65,7 @@ gros-81:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e8a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-81:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b74"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
index 5ff65c98e75..da6dd26e4cb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
@@ -65,6 +65,7 @@ gros-82:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba022"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-82:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121509957"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
index 07ce9e847f1..b895526a7d6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
@@ -65,6 +65,7 @@ gros-83:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45df1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-83:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f80"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
index 175699c45b8..8bba053de69 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
@@ -65,6 +65,7 @@ gros-84:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45de2"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-84:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a07512150349c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
index 9d74283e44a..9245ba48468 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
@@ -65,6 +65,7 @@ gros-85:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e481ff"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-85:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48820"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
index 1d186251407..3e1798654a2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
@@ -65,6 +65,7 @@ gros-86:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb47f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-86:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a0a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
index f834ea03872..385fc4fc440 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
@@ -65,6 +65,7 @@ gros-87:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4a892"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-87:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad22"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
index 3739dd08493..27cebe9f6a8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
@@ -65,6 +65,7 @@ gros-88:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4814a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-88:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad36"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
index af334a6af7e..b519dc4816d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
@@ -65,6 +65,7 @@ gros-89:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9c58"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-89:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f88"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
index 9debaa8925b..e7b70ae95c3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
@@ -65,6 +65,7 @@ gros-9:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d8a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-9:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483dc"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
index 83f81b99369..f157462eb76 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
@@ -65,6 +65,7 @@ gros-90:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d0e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-90:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47ecf"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
index 079e4086dfb..9107c9bcd26 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
@@ -65,6 +65,7 @@ gros-91:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9cb5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-91:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f3d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
index 6ebb60ff2d0..2e70a76d3a9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
@@ -65,6 +65,7 @@ gros-92:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45e15"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-92:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f71"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
index d504241d03b..85ef02ad295 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
@@ -65,6 +65,7 @@ gros-93:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45de1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-93:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48edd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
index 45f0bcd0507..0c6f2d0e863 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
@@ -65,6 +65,7 @@ gros-94:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45b44"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-94:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a07512150344f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
index f2d7ac092ee..aee42d7be21 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
@@ -65,6 +65,7 @@ gros-95:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d92"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-95:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482f8"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
index 0d7f8f9840c..c9d518d5496 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
@@ -65,6 +65,7 @@ gros-96:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9cef"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-96:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47e92"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
index b8ee9577a6d..e89ab349f55 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
@@ -65,6 +65,7 @@ gros-97:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9c21"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-97:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f92"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
index e85ca48c80e..210d0aaf923 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
@@ -65,6 +65,7 @@ gros-98:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45d26"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-98:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a07512150407c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
index 8c7ab51bc02..92e4dfeb65e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
@@ -65,6 +65,7 @@ gros-99:
     version: Gold 5220
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac66"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
@@ -72,6 +73,7 @@ gros-99:
       size: 480103981056
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4823a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
index 2bba766c689..156a83ac019 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
@@ -99,6 +99,7 @@ grouille-1:
     version: 7452
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee20f6cc95"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
       firmware_version: B709
@@ -106,6 +107,7 @@ grouille-1:
       size: 1920383410176
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075129de049a"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:2:0"
       firmware_version: D3DJ004
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
index 0a479813df5..5f44c714cc2 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
@@ -99,6 +99,7 @@ grouille-2:
     version: 7452
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee20f6cc9d"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
       firmware_version: B709
@@ -106,6 +107,7 @@ grouille-2:
       size: 1920383410176
       storage: SSD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075129de046c"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:2:0"
       firmware_version: D3DJ004
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
index 40b146bc61f..9470fc55348 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
@@ -115,6 +115,7 @@ grue-1:
     version: 7351
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f8c1d002577fac20390a63a"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
index e504c2199b9..94b8d24c4e6 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
@@ -115,6 +115,7 @@ grue-2:
     version: 7351
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f5a72002577fabc03912e15"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
index ba49642175c..42e799366a7 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
@@ -115,6 +115,7 @@ grue-3:
     version: 7351
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f5a86002577fabf03952f56"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
index eb8f9f6cd6b..f2b6d474e86 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
@@ -115,6 +115,7 @@ grue-4:
     version: 7351
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f8c1f002577fac703934f94"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
index 659d8042112..1340d9c34ce 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
@@ -115,6 +115,7 @@ grue-5:
     version: 7351
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f8c0d002577face0399668f"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
index 098c8f2cc03..67243b8b32a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
@@ -76,6 +76,7 @@ grvingt-1:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93315ab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
index 0f5673f8858..16f5d8a74dc 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
@@ -76,6 +76,7 @@ grvingt-10:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915da70"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
index 3cd54cb0f0c..5c85291027a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
@@ -76,6 +76,7 @@ grvingt-11:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9157be1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
index d16f52cdfa5..c41bfb0c2b5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
@@ -76,6 +76,7 @@ grvingt-12:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93364de"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
index 0664089ea38..fb3e040e9cb 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
@@ -76,6 +76,7 @@ grvingt-13:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b932ed31"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
index 8033cabeef2..415646201f5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
@@ -76,6 +76,7 @@ grvingt-14:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9334573"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
index ae184aa71d2..768851e903b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
@@ -76,6 +76,7 @@ grvingt-15:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9334d12"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
index 6c869a457b4..c74f549c81a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
@@ -76,6 +76,7 @@ grvingt-16:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93366e8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
index 44b5ec8b4ca..28cbdcc77e5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
@@ -76,6 +76,7 @@ grvingt-17:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915e6a6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
index 1616d12888d..3e3a638ab3e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
@@ -76,6 +76,7 @@ grvingt-18:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c58f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
index 28dfe389638..bac18dd736b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
@@ -76,6 +76,7 @@ grvingt-19:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9154683"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
index 97555c7fe09..16e9d523ab7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
@@ -76,6 +76,7 @@ grvingt-2:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b932f2bc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
index d80e9850d79..c75cd0fcfbf 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
@@ -76,6 +76,7 @@ grvingt-20:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9168163"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
index 81fe7cf8c70..001c319a849 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
@@ -76,6 +76,7 @@ grvingt-21:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bacba"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
index 5b86b9404e1..3d0e9035f0a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
@@ -76,6 +76,7 @@ grvingt-22:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91b74f6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
index 06d3b459cc7..26f0a4ae0e3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
@@ -76,6 +76,7 @@ grvingt-23:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bb032"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
index b00e54d8042..848891a7982 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
@@ -76,6 +76,7 @@ grvingt-24:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91ba0ef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
index 5e285c9b397..f33d062fd5c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
@@ -76,6 +76,7 @@ grvingt-25:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6ddd6d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
index 4a578bbfe65..ccadf2d6670 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
@@ -76,6 +76,7 @@ grvingt-26:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93360b0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
index a81bbf63348..e3837e07a91 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
@@ -76,6 +76,7 @@ grvingt-27:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6df578"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
index e44ac1fe386..fbaff4ca943 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
@@ -76,6 +76,7 @@ grvingt-28:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c705"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
index 317f24f3a75..05ee72e2534 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
@@ -76,6 +76,7 @@ grvingt-29:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c294"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
index 79210c7533c..5ca2650f398 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
@@ -76,6 +76,7 @@ grvingt-3:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93364a7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
index 15c9837e856..75843198f9c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
@@ -76,6 +76,7 @@ grvingt-30:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915d8cc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
index 69ea8cc7e85..09b0ef8736f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
@@ -76,6 +76,7 @@ grvingt-31:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9156789"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
index 00931df65f2..78b3fb7af63 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
@@ -76,6 +76,7 @@ grvingt-32:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915f70a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
index 826c5f6736d..0a089a5808a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
@@ -76,6 +76,7 @@ grvingt-33:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9158fb9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
index 5e48e0af0b6..4d93176e1e2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
@@ -76,6 +76,7 @@ grvingt-34:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b916b217"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
index 7cbb9969328..cc8352b5a55 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
@@ -76,6 +76,7 @@ grvingt-35:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91682e0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
index 25b141d7ff4..6a30f75f8dc 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
@@ -76,6 +76,7 @@ grvingt-36:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6241c4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
index f9771c7919f..15f9f628c4a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
@@ -76,6 +76,7 @@ grvingt-37:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c045"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
index 5991b0d82a1..74459b5f7c1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
@@ -76,6 +76,7 @@ grvingt-38:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9157c19"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
index 9b36f7b5d82..1482dddf8dc 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
@@ -76,6 +76,7 @@ grvingt-39:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91568d0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
index 204d5110ccc..be3eae60a0f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
@@ -76,6 +76,7 @@ grvingt-4:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93325e8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
index 993ffddec12..36c37085ea1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
@@ -76,6 +76,7 @@ grvingt-40:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915d1e5"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
index 69bc114fcda..65be16e7082 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
@@ -76,6 +76,7 @@ grvingt-41:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91b8973"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
index 1aacdf98d57..6f5d9ff2599 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
@@ -76,6 +76,7 @@ grvingt-42:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91da350"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
index 7c2cca12c29..25d66295c45 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
@@ -76,6 +76,7 @@ grvingt-43:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bae6d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
index f6f5bdf4de4..a2bab55ae55 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
@@ -76,6 +76,7 @@ grvingt-44:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91ba636"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
index d011b107f93..33c5c007fd6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
@@ -76,6 +76,7 @@ grvingt-45:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91671e7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
index cf3929b6ea3..0414b4bc1c4 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
@@ -76,6 +76,7 @@ grvingt-46:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9156f5b"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
index 39902a38c6d..e84bb5cbfb4 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
@@ -76,6 +76,7 @@ grvingt-47:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9157a5a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
index d2da1b96e98..aa98d465ab1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
@@ -76,6 +76,7 @@ grvingt-48:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6e229f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
index 0ac3ae14c73..ea2a62e1ca0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
@@ -76,6 +76,7 @@ grvingt-49:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bad73"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
index 847e19d2270..ee53feae6e1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
@@ -76,6 +76,7 @@ grvingt-5:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bb1ed"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
index e76479e2de6..2154fbb48b8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
@@ -76,6 +76,7 @@ grvingt-50:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91badab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
index 5334568c5f8..59a900fdbb9 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
@@ -76,6 +76,7 @@ grvingt-51:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915d9cb"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
index df801c19ed5..4ece96247a7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
@@ -76,6 +76,7 @@ grvingt-52:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c316"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
index 621198ce3be..ee2bf1a3c2a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
@@ -76,6 +76,7 @@ grvingt-53:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6e404d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
index 9fe763251b9..919a650dfa4 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
@@ -76,6 +76,7 @@ grvingt-54:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6e09e7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
index 0cfa114b1bc..6469c741657 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
@@ -76,6 +76,7 @@ grvingt-55:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915bfa9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
index 16143ed3e7c..bbaac767647 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
@@ -76,6 +76,7 @@ grvingt-56:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91560cc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
index 6b332f2a434..5b80addf520 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
@@ -76,6 +76,7 @@ grvingt-57:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915dad7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
index 78c468e6eb9..1fd3a63bc34 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
@@ -76,6 +76,7 @@ grvingt-58:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b916ae11"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
index 0beffb22167..ef799009422 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
@@ -76,6 +76,7 @@ grvingt-59:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915e558"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
index 086ecce32a4..1b4d90ce1e3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
@@ -76,6 +76,7 @@ grvingt-6:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91b7199"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
index b4ba972b354..ebf28813bca 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
@@ -76,6 +76,7 @@ grvingt-60:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9153a9b"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
index 22a04a0bf3f..0e5bc1dd95a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
@@ -76,6 +76,7 @@ grvingt-61:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bb2b6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
index 28448cede5b..b8dfc534e7c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
@@ -76,6 +76,7 @@ grvingt-62:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c3b5"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
index 9f5d065d526..b1b5e69f733 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
@@ -76,6 +76,7 @@ grvingt-63:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bad02"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
index 84ef3ec9f58..38bce017dca 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
@@ -76,6 +76,7 @@ grvingt-64:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91da1ef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
index 5e897817fc4..b9375a7a903 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
@@ -76,6 +76,7 @@ grvingt-7:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91ba41c"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
index 60d56532492..d6e3bcf0ec7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
@@ -76,6 +76,7 @@ grvingt-8:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91b7b04"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
index ad90a33b7c7..99c809d994d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
@@ -76,6 +76,7 @@ grvingt-9:
     version: Gold 6130
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b916812a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
index ce7c2a32f89..dd0b4d11215 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -82,6 +82,7 @@ econome-1:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb39c5"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
index 9b6c27edd97..f37fa2cd216 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -82,6 +82,7 @@ econome-10:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207107ae8"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
index 5cdb2f973d4..55adba3c217 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -82,6 +82,7 @@ econome-11:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb4a6d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
index 463540e33bd..8a1c6365d27 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -82,6 +82,7 @@ econome-12:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c65a85b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
index fe3c17869ac..b3ade7f0638 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -82,6 +82,7 @@ econome-13:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1ba5d63"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
index 1d558ebbd0a..71e64ba2b43 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -82,6 +82,7 @@ econome-14:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207106c19"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
index 51ab8065894..b0dba705b8d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -83,6 +83,7 @@ econome-15:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c659979"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
index 7eeb99c570f..87a15b06c26 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -82,6 +82,7 @@ econome-16:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c64d23d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
index 464d2dae58a..143b5163cc3 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -82,6 +82,7 @@ econome-17:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c6594dc"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
index d932b04aca5..e6356b1560f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -82,6 +82,7 @@ econome-18:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1ba84f1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
index 6b19f214e41..b448ba3e8f7 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -82,6 +82,7 @@ econome-19:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c655ff4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D06
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
index b866a28851e..8f50cee6680 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -82,6 +82,7 @@ econome-2:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb4095"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
index 196b543b06c..ab98e21102f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -82,6 +82,7 @@ econome-20:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c658eea"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D06
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
index 6845f71d200..3c5aba762ca 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -82,6 +82,7 @@ econome-21:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207106833"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D06
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
index 0359dd57d2c..6dedb846f27 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -82,6 +82,7 @@ econome-22:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2071063ca"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D06
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
index d21b1ebdf70..ee30db865ff 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -82,6 +82,7 @@ econome-3:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c659502"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
index 76f9c809ec5..0e4378b024b 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -82,6 +82,7 @@ econome-4:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c65918c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
index 99b7578b736..38bf7bce504 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -82,6 +82,7 @@ econome-5:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c658e9c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
index f25cc10ae5e..03ed42be29e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -82,6 +82,7 @@ econome-6:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207107f8d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
index 784ab2d533d..13b48ce81b5 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -82,6 +82,7 @@ econome-7:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb3ef7"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
index 323b2ac811f..dcb755cff54 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -82,6 +82,7 @@ econome-8:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb484c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
index 520f88c8723..aedc96b90be 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -82,6 +82,7 @@ econome-9:
     version: E5-2660
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207109227"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
index bdd52e45479..416ced84d21 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
@@ -83,6 +83,7 @@ ecotype-1:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890071"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
index 550602e12a2..13caca7d581 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
@@ -83,6 +83,7 @@ ecotype-10:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890041"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
index ddf076a612c..81237d70c9d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
@@ -83,6 +83,7 @@ ecotype-11:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a969"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
index c24be60713f..c47f9a2ef56 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
@@ -83,6 +83,7 @@ ecotype-12:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a90d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
index f52a7bed425..1f090ca3da6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
@@ -83,6 +83,7 @@ ecotype-13:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890009"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
index f6ef2258eb8..226766f59df 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
@@ -83,6 +83,7 @@ ecotype-14:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88fff5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
index 9cac6649275..3a8c5c75041 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
@@ -83,6 +83,7 @@ ecotype-15:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88fffd"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
index 7ac54f99f7e..f97ce165ff0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
@@ -83,6 +83,7 @@ ecotype-16:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890061"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
index f585f4d689d..4d21380941a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
@@ -83,6 +83,7 @@ ecotype-17:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88c98d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
index 58e5c8abb42..f81bf418c8c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
@@ -83,6 +83,7 @@ ecotype-18:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890005"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
index 3d546cba6b5..b9b4356df25 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
@@ -83,6 +83,7 @@ ecotype-19:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88c985"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
index 3cbc129a6d7..9ff13666a30 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
@@ -83,6 +83,7 @@ ecotype-2:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890079"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
index 89d6747afac..c14022be364 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
@@ -83,6 +83,7 @@ ecotype-20:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89006d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
index 793411ec8fd..3d119982e42 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
@@ -83,6 +83,7 @@ ecotype-21:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a92d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
index 5bcbfd78664..1da48f72c3a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
@@ -83,6 +83,7 @@ ecotype-22:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88ffe5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
index da6287dc967..acb8af7f5e4 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
@@ -83,6 +83,7 @@ ecotype-23:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9b9"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
index afba77d0bfc..463964e978b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
@@ -83,6 +83,7 @@ ecotype-24:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89ff4d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
index 849f9948b7f..2895a2b803e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
@@ -83,6 +83,7 @@ ecotype-25:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a955"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
index f634e5c43ee..1722ee389fe 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
@@ -83,6 +83,7 @@ ecotype-26:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a949"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
index 22535d6ce0d..69b23c416bb 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
@@ -83,6 +83,7 @@ ecotype-27:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a915"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
index 88ed7528715..1aee6d8e8aa 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
@@ -83,6 +83,7 @@ ecotype-28:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a921"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
index 76761f84736..fcb68749736 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
@@ -83,6 +83,7 @@ ecotype-29:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a931"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
index f0604fe1133..1a04acb0017 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
@@ -83,6 +83,7 @@ ecotype-3:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890035"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
index 17bced07377..3c155926a91 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
@@ -83,6 +83,7 @@ ecotype-30:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a975"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
index e118b7dd5b0..dd857e53302 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
@@ -83,6 +83,7 @@ ecotype-31:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a941"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
index 7c8ce54374e..7fc4b6d3bc7 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
@@ -83,6 +83,7 @@ ecotype-32:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a929"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
index f3124ecc0e7..4b2fafaca21 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
@@ -83,6 +83,7 @@ ecotype-33:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a971"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
index 2a4014dc7f6..8d2e652986c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
@@ -83,6 +83,7 @@ ecotype-34:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9ad"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
index f1832672ed9..023e94ec8db 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
@@ -83,6 +83,7 @@ ecotype-35:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9b1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
index 08ab2b8fef9..b75902a667c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
@@ -83,6 +83,7 @@ ecotype-36:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a919"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
index b6f7ada3075..1a8c3c30ca0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
@@ -83,6 +83,7 @@ ecotype-37:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9a1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
index c4fecb9ad62..91fc08f3b4a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
@@ -83,6 +83,7 @@ ecotype-38:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89ff21"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
index 379be5e5784..515c00149a5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
@@ -83,6 +83,7 @@ ecotype-39:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a999"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
index 2d2a43954da..5d89fd0905c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
@@ -83,6 +83,7 @@ ecotype-4:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89000d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
index 745e32e36d7..c983ad3ddec 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
@@ -83,6 +83,7 @@ ecotype-40:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a96d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
index b90d22a83b3..2008a9c5385 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
@@ -83,6 +83,7 @@ ecotype-41:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a91d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
index 96b89ab513b..1102db16a63 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
@@ -83,6 +83,7 @@ ecotype-42:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a945"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
index 3c8151554a4..6976dc57cd8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
@@ -83,6 +83,7 @@ ecotype-43:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890021"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
index 6d82caa3360..81cdd64deae 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
@@ -83,6 +83,7 @@ ecotype-44:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a911"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
index 0cb3453ee0c..5a626465c11 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
@@ -83,6 +83,7 @@ ecotype-45:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890065"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
index 40b1ba9a3de..d86b6c94ccd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
@@ -83,6 +83,7 @@ ecotype-46:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89ff1d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
index 07613910f28..a2217849574 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
@@ -83,6 +83,7 @@ ecotype-47:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88fff1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
index e435a383a4a..4013962078e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
@@ -83,6 +83,7 @@ ecotype-48:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9a5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
index dae2d68ad5a..27f3690c24e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
@@ -83,6 +83,7 @@ ecotype-5:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890081"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
index b7c5f26bd7f..b0b0c046a9c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
@@ -83,6 +83,7 @@ ecotype-6:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890011"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
index cbfaad7390e..50b04d89b7b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
@@ -83,6 +83,7 @@ ecotype-7:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a94d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
index 5772d78948b..63fcf173229 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
@@ -83,6 +83,7 @@ ecotype-8:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89ff19"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
index 7f00191450d..4b07a37a967 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
@@ -83,6 +83,7 @@ ecotype-9:
     version: E5-2630L v4
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89001d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
index b30c8c73da3..3e6e52174b5 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -84,6 +84,7 @@ paranoia-1:
     version: E5-2660 v2
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df1a80"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
@@ -91,6 +92,7 @@ paranoia-1:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df100c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
@@ -98,6 +100,7 @@ paranoia-1:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df0970"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
@@ -105,6 +108,7 @@ paranoia-1:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288cdc8"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
@@ -112,6 +116,7 @@ paranoia-1:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e114"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
index 3bbc43b1706..d7d68c58919 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -84,6 +84,7 @@ paranoia-2:
     version: E5-2660 v2
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e4d4"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
@@ -91,6 +92,7 @@ paranoia-2:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df0b5c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
@@ -98,6 +100,7 @@ paranoia-2:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c03ac"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
@@ -105,6 +108,7 @@ paranoia-2:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df128c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
@@ -112,6 +116,7 @@ paranoia-2:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c0d98"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
index fb1c60fd8f4..ddb7696dd62 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -84,6 +84,7 @@ paranoia-3:
     version: E5-2660 v2
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee755948ca4"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1P3
@@ -91,6 +92,7 @@ paranoia-3:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288d35c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
@@ -98,6 +100,7 @@ paranoia-3:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e3b8"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
@@ -105,6 +108,7 @@ paranoia-3:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c0c30"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
@@ -112,6 +116,7 @@ paranoia-3:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c0804"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
index e7a2603ec00..9052b983733 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -84,6 +84,7 @@ paranoia-4:
     version: E5-2660 v2
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288ddc4"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
@@ -91,6 +92,7 @@ paranoia-4:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022be9ac"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
@@ -98,6 +100,7 @@ paranoia-4:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0289bfa0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
@@ -105,6 +108,7 @@ paranoia-4:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022cebec"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
@@ -112,6 +116,7 @@ paranoia-4:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50014ee7003f5cd0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1P3
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
index 9ff1178bcaa..96765d603a1 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -84,6 +84,7 @@ paranoia-5:
     version: E5-2660 v2
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022bf824"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
@@ -91,6 +92,7 @@ paranoia-5:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022bfda0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
@@ -98,6 +100,7 @@ paranoia-5:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02deed90"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
@@ -105,6 +108,7 @@ paranoia-5:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02deed1c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
@@ -112,6 +116,7 @@ paranoia-5:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022be3e0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
index 01c15545133..5c5817a5974 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -84,6 +84,7 @@ paranoia-6:
     version: E5-2660 v2
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022bf804"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
@@ -91,6 +92,7 @@ paranoia-6:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df1a74"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
@@ -98,6 +100,7 @@ paranoia-6:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e394"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
@@ -105,6 +108,7 @@ paranoia-6:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df09a0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
@@ -112,6 +116,7 @@ paranoia-6:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02ded270"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
index 899daae7b85..4f470ea22ef 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -84,6 +84,7 @@ paranoia-7:
     version: E5-2660 v2
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022bf654"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
@@ -91,6 +92,7 @@ paranoia-7:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288c72c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
@@ -98,6 +100,7 @@ paranoia-7:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02def9dc"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
@@ -105,6 +108,7 @@ paranoia-7:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02dee7bc"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
@@ -112,6 +116,7 @@ paranoia-7:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df07a4"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
index a5d66c554b9..ca1dd968d1f 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -84,6 +84,7 @@ paranoia-8:
     version: E5-2660 v2
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df020c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
@@ -91,6 +92,7 @@ paranoia-8:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288d158"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
@@ -98,6 +100,7 @@ paranoia-8:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e160"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
@@ -105,6 +108,7 @@ paranoia-8:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df076c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
@@ -112,6 +116,7 @@ paranoia-8:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df06e8"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
index 5cf0c146f4c..83a22d0e749 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -87,6 +87,7 @@ parapide-1:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb8ec2"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
index c72e58e3580..bb8fe9b3d88 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -87,6 +87,7 @@ parapide-10:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca8844"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
index 5a9f6e1dbca..1ce99ac3eeb 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -87,6 +87,7 @@ parapide-12:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb9dc5"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
index 27a8d30920d..a6167edfc4a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -87,6 +87,7 @@ parapide-13:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cbef65"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
index f962566801c..7d1ab1893be 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -87,6 +87,7 @@ parapide-16:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca6979"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
index 8824a45d6e5..87cc40652c6 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -87,6 +87,7 @@ parapide-18:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca831b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
index bbb84da91ea..c05283082ae 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -87,6 +87,7 @@ parapide-19:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca7cc8"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
index 3b4b5b843eb..67b9cef09cb 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -87,6 +87,7 @@ parapide-2:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb9da8"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
index 093e892a0ea..7a78ecd8d76 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -87,6 +87,7 @@ parapide-21:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb9da5"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
index 8255949ff57..8fc3b4dd761 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -87,6 +87,7 @@ parapide-24:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214c88487"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
index cfb03c7c1f5..d0be98aca14 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -87,6 +87,7 @@ parapide-25:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca2a94"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
index 61911b93907..263d392555b 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -87,6 +87,7 @@ parapide-3:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb19b0"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
index ca6ba13a56e..e807b8e718f 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -87,6 +87,7 @@ parapide-5:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca6cca"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
index a25e99d077c..6c2716e2503 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -87,6 +87,7 @@ parapide-6:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca8327"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
index f51bd52aa09..b44471bebdd 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -87,6 +87,7 @@ parapide-7:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca6ca1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
index 3d96caad04a..839ab0a5565 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -87,6 +87,7 @@ parapide-8:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca5db1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
index 63cc1849a1d..bae54d87b13 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -87,6 +87,7 @@ parapide-9:
     version: X5570
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb9dba"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
index be4ec66f21d..0f8665ba2a7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -106,6 +106,7 @@ parapluie-1:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673a867"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
index 08b33707cca..e9e0e6337ab 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -106,6 +106,7 @@ parapluie-11:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500267425e2"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
index 8c3777246f7..51655a60f4d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -106,6 +106,7 @@ parapluie-12:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500267381ab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
index 7e1a9169d8e..adce161631a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -106,6 +106,7 @@ parapluie-15:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50026742543"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
index fa4dc3b632a..87462881878 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -106,6 +106,7 @@ parapluie-19:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500266f79b9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
index d848c6ba85f..a863269ffc7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -106,6 +106,7 @@ parapluie-2:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673584e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
index d59a0294caf..803cfa65d4a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -106,6 +106,7 @@ parapluie-20:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673c0bf"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
index 8adf670b156..f5b1be6fdb8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -106,6 +106,7 @@ parapluie-21:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50026742333"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
index 6e77f747697..b04be60f60f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -106,6 +106,7 @@ parapluie-22:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673e9f4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
index e30031881f6..ad3b4a830fd 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -106,6 +106,7 @@ parapluie-25:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673da68"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
index a7660bfce52..4745a6938c6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -106,6 +106,7 @@ parapluie-28:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002674695f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
index d21857936f2..f3bafce1ed7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -106,6 +106,7 @@ parapluie-31:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50026732a4a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
index b23139becec..7e94a0a1864 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -106,6 +106,7 @@ parapluie-32:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002674224e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
index cfcdfc4e866..e05248a1c1c 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -106,6 +106,7 @@ parapluie-35:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673f30f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
index e7c2f8aa809..a5bc096aa87 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -106,6 +106,7 @@ parapluie-38:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500267365d0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
index d933646a930..e2cece0e7d4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -106,6 +106,7 @@ parapluie-9:
     version: 6164 HE
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673a23e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
index 7e342ac3c75..7bc4705fcd8 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -83,6 +83,7 @@ parasilo-1:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa5b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-1:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4abf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-1:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-1:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfaaf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-1:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece7a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-1:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0444"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
index 1a77dfc899b..07ca0e16605 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -83,6 +83,7 @@ parasilo-10:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb564b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-10:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece93b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-10:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed38cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-10:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece58b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-10:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed39bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-10:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0440"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
index 950989f21fd..4cc47c3da47 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -83,6 +83,7 @@ parasilo-11:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2cb7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-11:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed330f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-11:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea138f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-11:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed25bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-11:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4bf7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-11:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0434"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
index 9633a1f7361..b1c22de9a4f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -83,6 +83,7 @@ parasilo-12:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf8bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-12:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2183"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-12:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf31b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-12:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4d2b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-12:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3e5b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-12:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0448"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
index 07c2de449b8..87ca15cf41a 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -83,6 +83,7 @@ parasilo-13:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5853"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-13:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfaef"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-13:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5757"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-13:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5743"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-13:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000399b850bdad"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: EF05
@@ -118,6 +123,7 @@ parasilo-13:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0428"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
index a1e71a36503..ae3dc096242 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -83,6 +83,7 @@ parasilo-14:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2ad3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-14:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea46e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-14:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6203"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-14:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4b47"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-14:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9e10b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-14:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0418"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
index 570d5f407d4..567c2a710f1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -83,6 +83,7 @@ parasilo-15:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed51df"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-15:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed54a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-15:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed53b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-15:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2987"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-15:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5473"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-15:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a045c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
index 0583c5b0e00..e16f3cc56bb 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -83,6 +83,7 @@ parasilo-16:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5bda57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-16:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5c4367"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-16:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5c6c3b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-16:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5c2b63"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-16:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f599d83"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-16:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003960c8a50d0"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
index 4e04e56decf..efc711acfa0 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -83,6 +83,7 @@ parasilo-17:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfb4f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-17:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3eeb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-17:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf927"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-17:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed58a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-17:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe5f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-17:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0414"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
index 6c091ec1b11..10b41426740 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -83,6 +83,7 @@ parasilo-18:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4ba3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-18:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4973"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-18:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb850b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-18:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea04a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-18:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0cc3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-18:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0474"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
index cfdee3332f6..58bd2894afd 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -83,6 +83,7 @@ parasilo-19:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ececf7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-19:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece23f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-19:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed576b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-19:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3927"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-19:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa2b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-19:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0410"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
index 291f68033cd..a5b375682ba 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -83,6 +83,7 @@ parasilo-2:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5147"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-2:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4caf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-2:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2c57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-2:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed21c7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-2:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f4b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-2:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0424"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
index cce100b357d..dfba28fec2a 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -83,6 +83,7 @@ parasilo-20:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb45d3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-20:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa17"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-20:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed545f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-20:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4dcf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-20:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4c87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-20:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0488"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
index 7fb505d8ef1..3c58b1cacd0 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -83,6 +83,7 @@ parasilo-21:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4767"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-21:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5747"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-21:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed20e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-21:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecea1f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-21:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed52b3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-21:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0454"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
index 26424fdc51f..2df9164ec17 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -83,6 +83,7 @@ parasilo-22:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf3c7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-22:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf97b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-22:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecec93"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-22:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2273"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-22:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf603"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-22:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0450"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
index f2bf1893ce0..96ce7516487 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -83,6 +83,7 @@ parasilo-23:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb74eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-23:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2bff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-23:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4937"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-23:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea47f3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-23:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0e53"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-23:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a044c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
index de5b242153f..63d0ad8d534 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -83,6 +83,7 @@ parasilo-24:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7557"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-24:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6ca7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-24:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb93bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-24:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7143"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-24:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea041f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-24:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0460"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
index 92b656239ab..a67c4aba3fe 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -83,6 +83,7 @@ parasilo-25:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2faf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-25:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb964f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-25:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5009f30f6bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: VT33
@@ -104,6 +107,7 @@ parasilo-25:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fdff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-25:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6a27"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-25:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0464"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
index 2c5cc5ca7d9..a859a9e6ba6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -83,6 +83,7 @@ parasilo-26:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4c4f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-26:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf353"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-26:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5467"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-26:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed527b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-26:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed511b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-26:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a048c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
index 427a04275e9..2ffae121421 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -83,6 +83,7 @@ parasilo-27:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2263"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-27:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecdef7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-27:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5573"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-27:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed226b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-27:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed579b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-27:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a06f4"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
index d84c3f214f9..9dafdd14f74 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -83,6 +83,7 @@ parasilo-28:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4a93"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-28:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5193"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-28:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0b1b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-28:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7053"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-28:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4f87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-28:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0468"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
index e1d5a1f422a..e73513821c0 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -83,6 +83,7 @@ parasilo-3:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf8d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-3:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b0f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-3:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ececbb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-3:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb87f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-3:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3d8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-3:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0498"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
index 1fc12d07834..068dca4258e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -83,6 +83,7 @@ parasilo-4:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f5f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-4:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece5b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-4:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b47"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-4:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4847"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-4:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf913"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-4:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0490"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
index cecc6f71270..20b80d5c66a 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -83,6 +83,7 @@ parasilo-5:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed310f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-5:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5587"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-5:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3283"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-5:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2eeb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-5:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3183"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-5:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0458"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
index 979508d7d49..70a39dfebc6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -83,6 +83,7 @@ parasilo-6:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2d4f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-6:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed570f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-6:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed466b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-6:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3eff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-6:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed29a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-6:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003973c889ab1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: AM07
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
index 58e941d911f..6bcc2af1b13 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -83,6 +83,7 @@ parasilo-7:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2a37"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-7:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5597"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-7:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf0cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-7:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece9f3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-7:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece66b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-7:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0438"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
index b2191bebc24..0dfe8172843 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -83,6 +83,7 @@ parasilo-8:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed553f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-8:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafca7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-8:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2a9b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-8:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3ca3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-8:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed22b3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-8:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a043c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
index 066ba9a8169..4b7ae334792 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -83,6 +83,7 @@ parasilo-9:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed518f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ parasilo-9:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2693"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
@@ -97,6 +99,7 @@ parasilo-9:
       size: 600127266816
       storage: HDD
     sdc:
+      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed219b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
@@ -104,6 +107,7 @@ parasilo-9:
       size: 600127266816
       storage: HDD
     sdd:
+      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed30ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
@@ -111,6 +115,7 @@ parasilo-9:
       size: 600127266816
       storage: HDD
     sde:
+      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb778f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
@@ -118,6 +123,7 @@ parasilo-9:
       size: 600127266816
       storage: HDD
     sdf:
+      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a041c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
index 454eceb39e4..883d2089b25 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -83,6 +83,7 @@ paravance-1:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4fbb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-1:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8577"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
index c2b5ddc3e34..ad6762b9cba 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -83,6 +83,7 @@ paravance-10:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb9323"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-10:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f8b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
index 131865a9613..1ad97ca6c87 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -83,6 +83,7 @@ paravance-11:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea949f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-11:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea738f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
index 71873436591..fe26b9aae6a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -83,6 +83,7 @@ paravance-12:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eae1bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-12:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafe1b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
index 86678735ff2..d672a41e4f0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -83,6 +83,7 @@ paravance-13:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eae193"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-13:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4923"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
index 8664725d417..f62879c4806 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -83,6 +83,7 @@ paravance-14:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4c03"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-14:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eac923"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
index 0d6d5d71abc..2863d9a3532 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -83,6 +83,7 @@ paravance-15:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8583"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-15:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb47c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
index 50f721474c7..944cca2f7c3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -83,6 +83,7 @@ paravance-16:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed301b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-16:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2687"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
index 2549c72c5ee..fda739d0591 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -83,6 +83,7 @@ paravance-17:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4927"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-17:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8893"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
index 1af08e54e03..8cae431f33d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -83,6 +83,7 @@ paravance-18:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea91a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-18:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb470b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
index 2aa01b94112..9ebaac8f1e6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -83,6 +83,7 @@ paravance-19:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3fff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-19:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2acf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
index 6b8e9bca5f9..e032fd5f48e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -83,6 +83,7 @@ paravance-2:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea3313"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-2:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea29a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
index d8291672f4d..7655a57c1e5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -83,6 +83,7 @@ paravance-20:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4fe3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-20:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb762f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
index be34128b963..ceaa717a488 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -83,6 +83,7 @@ paravance-21:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007e83552f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-21:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007e8343bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
index a33e7bec38f..e1a8a8b2c87 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -83,6 +83,7 @@ paravance-22:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6bf7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-22:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9d847"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
index cc335ae4a46..fbf3ac6ad6a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -83,6 +83,7 @@ paravance-23:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2f03"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-23:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5833"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
index 1377cb7766f..e748f2dbe0a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -83,6 +83,7 @@ paravance-24:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea87eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-24:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6a53"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
index b2b536a97b0..7a41337168f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -83,6 +83,7 @@ paravance-25:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed595b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-25:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf5fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
index 5d34e82c422..68e18fe6e40 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -83,6 +83,7 @@ paravance-26:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eceba3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-26:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed57cf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
index f0bc9951fc0..046441d153e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -83,6 +83,7 @@ paravance-27:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3007"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-27:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb577b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
index 8822735b5d4..0b59319af67 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -83,6 +83,7 @@ paravance-28:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea69e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-28:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4a83"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
index 13b46a3bba5..41b1716b5f3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -83,6 +83,7 @@ paravance-29:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed269f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-29:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5703"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
index fb17bfba9c2..f6944cbfe9c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -83,6 +83,7 @@ paravance-3:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb48c7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-3:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7233"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
index cc6402b102e..0f410d5f7bc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -83,6 +83,7 @@ paravance-30:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb2f1b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-30:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8ee3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
index d5d6c3441c7..be4e53c3c2d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -83,6 +83,7 @@ paravance-31:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eada3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-31:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb25a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
index e02c0d7df0f..1055b0ba5fb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -83,6 +83,7 @@ paravance-32:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb72df"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-32:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea1343"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
index 58488e70263..bf652bc41be 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -83,6 +83,7 @@ paravance-33:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2e33"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-33:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3ac3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
index 2463363431e..f5eef1c5cbb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -83,6 +83,7 @@ paravance-34:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eab427"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-34:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea85f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
index 502dd1e6940..8a3c4c6b3e5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -83,6 +83,7 @@ paravance-35:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa73"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-35:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed54e3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
index e5c960b9575..09e7eee3060 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -83,6 +83,7 @@ paravance-36:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf9d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-36:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3047"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
index 60ac3d8df1f..7ec853951ba 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -83,6 +83,7 @@ paravance-37:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb2f73"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-37:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb87cf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
index f86fe0a55b7..03f58939baa 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -83,6 +83,7 @@ paravance-38:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea75d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-38:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb010b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
index 0e46fa7ee30..b88c4fc6b69 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -83,6 +83,7 @@ paravance-39:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8def"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-39:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ead217"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
index 8948c6074f2..cd9146ad213 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -83,6 +83,7 @@ paravance-4:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4d87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-4:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea08bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
index 402a5551d9f..f28a3b1dc7c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -83,6 +83,7 @@ paravance-40:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb186f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-40:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7717"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
index d8ad38b5309..bf5e0f4b4c5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -83,6 +83,7 @@ paravance-41:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea78cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-41:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0323"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
index 66098380284..2d715bf6b1f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -83,6 +83,7 @@ paravance-42:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eadf73"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-42:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6d47"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
index 5002679f4ac..afa6da9879b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -83,6 +83,7 @@ paravance-43:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe5b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-43:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9baf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
index b1581172dac..66a9849202a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -83,6 +83,7 @@ paravance-44:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea13a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-44:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0dfb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
index 68cf9267f17..0ffbd670d04 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -83,6 +83,7 @@ paravance-45:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb77bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-45:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb72c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
index 820832e245a..b2ac3f11ca2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -83,6 +83,7 @@ paravance-46:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafecf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-46:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eacc33"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
index eac6a597e5b..0cd25ef66ed 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -83,6 +83,7 @@ paravance-47:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed513b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-47:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed580f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
index 8d8fc257c3b..949eeec65b5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -83,6 +83,7 @@ paravance-48:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9bf7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-48:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7a7b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
index 32285d64392..b60fd111d22 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -83,6 +83,7 @@ paravance-49:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4d8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-49:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6fbb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
index bb15061ea1f..38d758f14f7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -83,6 +83,7 @@ paravance-5:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea014f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-5:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabc07"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
index 545ba3c1ddf..c19978c8900 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -83,6 +83,7 @@ paravance-50:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8537"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-50:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6af7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
index 1a985918f5f..dec06f6535b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -83,6 +83,7 @@ paravance-51:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb1597"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-51:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb1717"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
index 4d76d9af565..f3006a57927 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -83,6 +83,7 @@ paravance-52:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7627"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-52:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6fa7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
index 27bab55784a..7137ba8e6a3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -83,6 +83,7 @@ paravance-53:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb886f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-53:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed481f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
index 7190d5a4220..6e7787803be 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -83,6 +83,7 @@ paravance-54:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-54:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9ef77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
index 937ac89533d..ddd8f04f73b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -83,6 +83,7 @@ paravance-55:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed290b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-55:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4ceb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
index 142070a249e..0ae956c25a3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -83,6 +83,7 @@ paravance-56:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7c83"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-56:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8057"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
index f99c331aa04..f7a64c1cfbb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -83,6 +83,7 @@ paravance-57:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb394b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-57:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabc23"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
index 54f09e526ee..3eec8947257 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -83,6 +83,7 @@ paravance-58:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecdf53"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-58:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9d8af"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
index 80b573195c3..ac62450b787 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -83,6 +83,7 @@ paravance-59:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ead9ef"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-59:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf54f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
index 8d6265a1dc9..bdfc5ccdf56 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -83,6 +83,7 @@ paravance-6:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb47b3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-6:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb79bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
index 7d6ae6f4f6e..20a29c0044d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -83,6 +83,7 @@ paravance-60:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0ffb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-60:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0767"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
index a31bff7c353..9eac1e6688d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -83,6 +83,7 @@ paravance-61:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0ef3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-61:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb509f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
index 4aadaf5ad7b..c3205c7f814 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -83,6 +83,7 @@ paravance-62:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5009833e3e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-62:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4b4b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
index 21d9d8db930..9e0707f7dd6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -83,6 +83,7 @@ paravance-63:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4d27"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-63:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5dd3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
index 55e736dec25..81a06e6142f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -83,6 +83,7 @@ paravance-64:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb2943"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-64:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7977"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
index a276dac48f6..e38b5868173 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -83,6 +83,7 @@ paravance-65:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5607"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-65:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8797"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
index 87ab7c4f1aa..efe4e285586 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -83,6 +83,7 @@ paravance-66:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4c43"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-66:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed593b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
index 1c1b432daa4..f211422ad71 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -83,6 +83,7 @@ paravance-67:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed21f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-67:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4a2b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
index 48bb929c2b1..a9cce191101 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -83,6 +83,7 @@ paravance-68:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecea0f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-68:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4857"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
index bd5079d306e..0bf6fce9915 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -83,6 +83,7 @@ paravance-69:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7ffb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-69:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb733f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
index fa8770a0677..b67be535409 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -83,6 +83,7 @@ paravance-7:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9e3f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-7:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eaafe3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
index 00eafeb9705..5f224fa2ff8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -83,6 +83,7 @@ paravance-70:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb349f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-70:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea46f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
index aa3c24ce52e..bf7c50df761 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -83,6 +83,7 @@ paravance-71:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ead253"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-71:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8fc7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
index dd1b62e9a61..0f41961e495 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -83,6 +83,7 @@ paravance-72:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007e834757"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-72:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabb77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
index 0b8a81102fe..e3753c67be9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -83,6 +83,7 @@ paravance-8:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0ac3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-8:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8003"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
index b28977cd6d9..fe8b6b588be 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -83,6 +83,7 @@ paravance-9:
     version: E5-2630 v3
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe9f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
@@ -90,6 +91,7 @@ paravance-9:
       size: 600127266816
       storage: HDD
     sdb:
+      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9c67"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
index 89cc9932eb3..588137b7dfa 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
@@ -87,6 +87,7 @@ uvb-1:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee10377365d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
index b8838cd9d40..c486d08a6c9 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
@@ -87,6 +87,7 @@ uvb-10:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d2ac9e"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
index fb483cf97fe..9ca1f6f2bb8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
@@ -87,6 +87,7 @@ uvb-11:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037d9b0a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
index a3ca395808d..aecb4f7ab69 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
@@ -87,6 +87,7 @@ uvb-12:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037dca3a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
index c133e6520a2..a5598703bf1 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
@@ -87,6 +87,7 @@ uvb-14:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae21aa9f"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
index 6bfbf8f1cff..4d1f9c3fd3e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
@@ -87,6 +87,7 @@ uvb-16:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d27392"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
index 146ba3cbb0d..e97ee0e2123 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
@@ -87,6 +87,7 @@ uvb-17:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee103772647"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
index 4be08ef184d..cf52fd7954b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
@@ -87,6 +87,7 @@ uvb-18:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d29b95"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
index e05321b818d..0fdc03e3271 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
@@ -87,6 +87,7 @@ uvb-2:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee103774dad"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
index 7db835cd80f..9090aa8a44b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
@@ -87,6 +87,7 @@ uvb-25:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158c527af"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
index 5902f2a3bff..bf0f78b4956 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
@@ -87,6 +87,7 @@ uvb-26:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae140810"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
index f021bc7dd8e..ba9205b2ff6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
@@ -87,6 +87,7 @@ uvb-27:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158c4f2bc"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
index 38a1b867a98..6405b469ab9 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
@@ -87,6 +87,7 @@ uvb-28:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae13ef0b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
index fb5827e5451..98b5945046c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
@@ -87,6 +87,7 @@ uvb-29:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037d9c5c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
index 1062c65470a..e7a3fb9aaad 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
@@ -87,6 +87,7 @@ uvb-31:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d2ab65"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
index a750bd9c480..c7a47b1a830 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
@@ -87,6 +87,7 @@ uvb-33:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158df841f"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
index a5cd207a1b6..72c0a5fd12d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
@@ -87,6 +87,7 @@ uvb-34:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d28b88"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
index ff6666bcf6f..79613bd45e3 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
@@ -87,6 +87,7 @@ uvb-35:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d27497"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
index 3651051a5a7..2213e9570b1 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
@@ -87,6 +87,7 @@ uvb-36:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d28666"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
index cbbe087c9d7..1a71931b581 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
@@ -87,6 +87,7 @@ uvb-37:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d2867d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
index 7986c1c79fc..ea747db8949 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
@@ -87,6 +87,7 @@ uvb-38:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037db989"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
index a4917a8e724..bbe8f908a57 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
@@ -87,6 +87,7 @@ uvb-4:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee10377055c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
index e356d612334..b517df3f3d4 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
@@ -87,6 +87,7 @@ uvb-41:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae1b17e1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
index 0a809496710..86b26cd749e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
@@ -87,6 +87,7 @@ uvb-42:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee103771a9a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
index 1c84fdafcb9..9b232a5b0f3 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
@@ -87,6 +87,7 @@ uvb-43:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158cc32ab"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
index 90c3fb2361a..54a4c222552 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
@@ -87,6 +87,7 @@ uvb-44:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee10377331d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
index 021b12f7a75..6147d50ccdf 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
@@ -87,6 +87,7 @@ uvb-5:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae216ca4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
index 24fa1920623..34e2a940522 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
@@ -87,6 +87,7 @@ uvb-6:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d274c4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
index 9e38461a154..e09d6de1c74 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
@@ -87,6 +87,7 @@ uvb-7:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037d9b68"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
index 34beb65c3ed..78c78068ac8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
@@ -87,6 +87,7 @@ uvb-8:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037d9480"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
index 20641a7d761..5be0fee2be0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
@@ -87,6 +87,7 @@ uvb-9:
     version: X5670
   storage_devices:
     sda:
+      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d2880d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
diff --git a/lib/refrepo/valid/input/schemas/schema-node.yaml b/lib/refrepo/valid/input/schemas/schema-node.yaml
index 39311f47d56..65bfb47b788 100644
--- a/lib/refrepo/valid/input/schemas/schema-node.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-node.yaml
@@ -102,6 +102,7 @@ software:
 status: optional_string
 storage_devices:
   <multi>:
+    id: string
     by_id: optional_string
     by_path: optional_string
     unstable_device_name: optional_boolean
-- 
GitLab


From 7167c7bdc8b84a522ff3533f557e3fd8a8562f98 Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Mon, 28 Jun 2021 14:08:40 +0200
Subject: [PATCH 2/3] [data] "rake reference-api" to add id to disks

---
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-10.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-11.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-12.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-13.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-14.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-15.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-16.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-17.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-18.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-19.json         | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-20.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-21.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-22.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-23.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-24.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-25.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-26.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-27.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-28.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-29.json         | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-30.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-31.json         | 3 +++
 .../sites/grenoble/clusters/dahu/nodes/dahu-32.json         | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json | 3 +++
 .../grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json | 3 +++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json | 2 ++
 .../sites/grenoble/clusters/drac/nodes/drac-10.json         | 2 ++
 .../sites/grenoble/clusters/drac/nodes/drac-11.json         | 2 ++
 .../sites/grenoble/clusters/drac/nodes/drac-12.json         | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json | 2 ++
 .../grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json | 2 ++
 .../sites/grenoble/clusters/troll/nodes/troll-1.json        | 2 ++
 .../sites/grenoble/clusters/troll/nodes/troll-2.json        | 2 ++
 .../sites/grenoble/clusters/troll/nodes/troll-3.json        | 2 ++
 .../sites/grenoble/clusters/troll/nodes/troll-4.json        | 2 ++
 .../grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json | 6 ++++++
 .../grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json | 6 ++++++
 .../grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json | 6 ++++++
 .../grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json | 6 ++++++
 .../sites/lille/clusters/chetemi/nodes/chetemi-1.json       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-10.json      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-11.json      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-12.json      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-13.json      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-14.json      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-15.json      | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-2.json       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-3.json       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-4.json       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-5.json       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-6.json       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-7.json       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-8.json       | 2 ++
 .../sites/lille/clusters/chetemi/nodes/chetemi-9.json       | 2 ++
 .../sites/lille/clusters/chiclet/nodes/chiclet-1.json       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-2.json       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-3.json       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-4.json       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-5.json       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-6.json       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-7.json       | 3 +++
 .../sites/lille/clusters/chiclet/nodes/chiclet-8.json       | 3 +++
 .../sites/lille/clusters/chifflet/nodes/chifflet-1.json     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-2.json     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-3.json     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-4.json     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-5.json     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-6.json     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-7.json     | 4 ++++
 .../sites/lille/clusters/chifflet/nodes/chifflet-8.json     | 4 ++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-1.json     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-2.json     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-3.json     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-4.json     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-5.json     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-6.json     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-7.json     | 6 ++++++
 .../sites/lille/clusters/chifflot/nodes/chifflot-8.json     | 6 ++++++
 .../clusters/petitprince/nodes/petitprince-1.json           | 1 +
 .../clusters/petitprince/nodes/petitprince-10.json          | 1 +
 .../clusters/petitprince/nodes/petitprince-11.json          | 1 +
 .../clusters/petitprince/nodes/petitprince-13.json          | 1 +
 .../clusters/petitprince/nodes/petitprince-14.json          | 1 +
 .../clusters/petitprince/nodes/petitprince-15.json          | 1 +
 .../clusters/petitprince/nodes/petitprince-16.json          | 1 +
 .../clusters/petitprince/nodes/petitprince-2.json           | 1 +
 .../clusters/petitprince/nodes/petitprince-3.json           | 1 +
 .../clusters/petitprince/nodes/petitprince-4.json           | 1 +
 .../clusters/petitprince/nodes/petitprince-5.json           | 1 +
 .../clusters/petitprince/nodes/petitprince-6.json           | 1 +
 .../clusters/petitprince/nodes/petitprince-7.json           | 1 +
 .../clusters/petitprince/nodes/petitprince-9.json           | 1 +
 .../grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json | 5 +++++
 .../grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json | 5 +++++
 .../sites/lyon/clusters/hercule/nodes/hercule-1.json        | 3 +++
 .../sites/lyon/clusters/hercule/nodes/hercule-2.json        | 3 +++
 .../sites/lyon/clusters/hercule/nodes/hercule-3.json        | 3 +++
 .../sites/lyon/clusters/hercule/nodes/hercule-4.json        | 3 +++
 .../sites/lyon/clusters/neowise/nodes/neowise-1.json        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-10.json       | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-2.json        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-3.json        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-4.json        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-5.json        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-6.json        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-7.json        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-8.json        | 1 +
 .../sites/lyon/clusters/neowise/nodes/neowise-9.json        | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json    | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json    | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json   | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json    | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json    | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json    | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json    | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json    | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json    | 1 +
 data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json    | 1 +
 data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json  | 1 +
 data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json  | 1 +
 data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json  | 1 +
 data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json  | 1 +
 data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json  | 2 ++
 data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json  | 2 ++
 data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json  | 2 ++
 data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json  | 2 ++
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json  | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json  | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-10.json         | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-11.json         | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-12.json         | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-13.json         | 1 +
 .../sites/lyon/clusters/taurus/nodes/taurus-15.json         | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json | 1 +
 .../grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-1.json     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-10.json    | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-11.json    | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-12.json    | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-13.json    | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-2.json     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-3.json     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-4.json     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-5.json     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-6.json     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-7.json     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-8.json     | 1 +
 .../sites/nancy/clusters/graffiti/nodes/graffiti-9.json     | 1 +
 .../sites/nancy/clusters/graoully/nodes/graoully-1.json     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-10.json    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-11.json    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-12.json    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-13.json    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-14.json    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-15.json    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-16.json    | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-2.json     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-3.json     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-4.json     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-5.json     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-6.json     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-7.json     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-8.json     | 2 ++
 .../sites/nancy/clusters/graoully/nodes/graoully-9.json     | 2 ++
 .../sites/nancy/clusters/graphique/nodes/graphique-1.json   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-2.json   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-3.json   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-4.json   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-5.json   | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-6.json   | 1 +
 .../sites/nancy/clusters/graphite/nodes/graphite-1.json     | 2 ++
 .../sites/nancy/clusters/graphite/nodes/graphite-2.json     | 2 ++
 .../sites/nancy/clusters/graphite/nodes/graphite-3.json     | 2 ++
 .../sites/nancy/clusters/graphite/nodes/graphite-4.json     | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-1.json         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-10.json        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-11.json        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-12.json        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-13.json        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-14.json        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-15.json        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-16.json        | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-2.json         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-3.json         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-4.json         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-5.json         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-6.json         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-7.json         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-8.json         | 2 ++
 .../sites/nancy/clusters/grappe/nodes/grappe-9.json         | 2 ++
 .../sites/nancy/clusters/grcinq/nodes/grcinq-1.json         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-10.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-11.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-12.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-13.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-14.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-15.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-16.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-17.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-18.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-19.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-2.json         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-20.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-21.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-22.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-23.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-24.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-25.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-26.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-27.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-28.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-29.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-3.json         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-30.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-31.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-32.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-33.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-34.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-35.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-36.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-37.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-38.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-39.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-4.json         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-40.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-41.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-42.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-43.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-44.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-45.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-46.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-47.json        | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-5.json         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-6.json         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-7.json         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-8.json         | 1 +
 .../sites/nancy/clusters/grcinq/nodes/grcinq-9.json         | 1 +
 data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-10.json | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-11.json | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-12.json | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-13.json | 2 ++
 .../grid5000/sites/nancy/clusters/grele/nodes/grele-14.json | 2 ++
 data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json | 2 ++
 data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json | 2 ++
 data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json | 2 ++
 data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json | 2 ++
 data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json | 2 ++
 data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json | 2 ++
 data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json | 2 ++
 data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json | 2 ++
 .../sites/nancy/clusters/grimani/nodes/grimani-1.json       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-2.json       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-3.json       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-4.json       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-5.json       | 1 +
 .../sites/nancy/clusters/grimani/nodes/grimani-6.json       | 1 +
 .../sites/nancy/clusters/grimoire/nodes/grimoire-1.json     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-2.json     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-3.json     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-4.json     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-5.json     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-6.json     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-7.json     | 6 ++++++
 .../sites/nancy/clusters/grimoire/nodes/grimoire-8.json     | 6 ++++++
 .../sites/nancy/clusters/grisou/nodes/grisou-1.json         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-10.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-11.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-12.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-13.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-14.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-15.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-16.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-17.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-18.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-19.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-2.json         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-20.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-21.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-22.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-23.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-24.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-25.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-26.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-27.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-28.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-29.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-3.json         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-30.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-31.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-32.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-33.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-34.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-35.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-36.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-37.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-38.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-39.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-4.json         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-40.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-41.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-42.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-43.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-44.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-45.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-46.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-47.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-48.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-49.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-5.json         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-50.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-51.json        | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-6.json         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-7.json         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-8.json         | 2 ++
 .../sites/nancy/clusters/grisou/nodes/grisou-9.json         | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json   | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json   | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json   | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json   | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json   | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json   | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json   | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json   | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json   | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json  | 2 ++
 data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json  | 2 ++
 .../sites/nancy/clusters/grouille/nodes/grouille-1.json     | 2 ++
 .../sites/nancy/clusters/grouille/nodes/grouille-2.json     | 2 ++
 data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json   | 1 +
 data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json   | 1 +
 data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json   | 1 +
 data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json   | 1 +
 data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json   | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-1.json       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-10.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-11.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-12.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-13.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-14.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-15.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-16.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-17.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-18.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-19.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-2.json       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-20.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-21.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-22.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-23.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-24.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-25.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-26.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-27.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-28.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-29.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-3.json       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-30.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-31.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-32.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-33.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-34.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-35.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-36.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-37.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-38.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-39.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-4.json       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-40.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-41.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-42.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-43.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-44.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-45.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-46.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-47.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-48.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-49.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-5.json       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-50.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-51.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-52.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-53.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-54.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-55.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-56.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-57.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-58.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-59.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-6.json       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-60.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-61.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-62.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-63.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-64.json      | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-7.json       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-8.json       | 1 +
 .../sites/nancy/clusters/grvingt/nodes/grvingt-9.json       | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-1.json      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-10.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-11.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-12.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-13.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-14.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-15.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-16.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-17.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-18.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-19.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-2.json      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-20.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-21.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-22.json     | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-3.json      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-4.json      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-5.json      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-6.json      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-7.json      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-8.json      | 1 +
 .../sites/nantes/clusters/econome/nodes/econome-9.json      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-1.json      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-10.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-11.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-12.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-13.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-14.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-15.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-16.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-17.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-18.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-19.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-2.json      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-20.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-21.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-22.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-23.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-24.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-25.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-26.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-27.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-28.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-29.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-3.json      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-30.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-31.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-32.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-33.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-34.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-35.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-36.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-37.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-38.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-39.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-4.json      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-40.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-41.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-42.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-43.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-44.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-45.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-46.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-47.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-48.json     | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-5.json      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-6.json      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-7.json      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-8.json      | 1 +
 .../sites/nantes/clusters/ecotype/nodes/ecotype-9.json      | 1 +
 .../sites/rennes/clusters/paranoia/nodes/paranoia-1.json    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-2.json    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-3.json    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-4.json    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-5.json    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-6.json    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-7.json    | 5 +++++
 .../sites/rennes/clusters/paranoia/nodes/paranoia-8.json    | 5 +++++
 .../sites/rennes/clusters/parapide/nodes/parapide-1.json    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-10.json   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-12.json   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-13.json   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-16.json   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-18.json   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-19.json   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-2.json    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-21.json   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-24.json   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-25.json   | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-3.json    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-5.json    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-6.json    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-7.json    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-8.json    | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-9.json    | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-1.json  | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-11.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-12.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-15.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-19.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-2.json  | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-20.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-21.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-22.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-25.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-28.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-31.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-32.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-35.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-38.json | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-9.json  | 1 +
 .../sites/rennes/clusters/parasilo/nodes/parasilo-1.json    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-10.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-11.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-12.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-13.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-14.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-15.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-16.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-17.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-18.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-19.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-2.json    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-20.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-21.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-22.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-23.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-24.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-25.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-26.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-27.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-28.json   | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-3.json    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-4.json    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-5.json    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-6.json    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-7.json    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-8.json    | 6 ++++++
 .../sites/rennes/clusters/parasilo/nodes/parasilo-9.json    | 6 ++++++
 .../sites/rennes/clusters/paravance/nodes/paravance-1.json  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-10.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-11.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-12.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-13.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-14.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-15.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-16.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-17.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-18.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-19.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-2.json  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-20.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-21.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-22.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-23.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-24.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-25.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-26.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-27.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-28.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-29.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-3.json  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-30.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-31.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-32.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-33.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-34.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-35.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-36.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-37.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-38.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-39.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-4.json  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-40.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-41.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-42.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-43.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-44.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-45.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-46.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-47.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-48.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-49.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-5.json  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-50.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-51.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-52.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-53.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-54.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-55.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-56.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-57.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-58.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-59.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-6.json  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-60.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-61.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-62.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-63.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-64.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-65.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-66.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-67.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-68.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-69.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-7.json  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-70.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-71.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-72.json | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-8.json  | 2 ++
 .../sites/rennes/clusters/paravance/nodes/paravance-9.json  | 2 ++
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json    | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json    | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json    | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json   | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json    | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json    | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json    | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json    | 1 +
 data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json    | 1 +
 797 files changed, 1523 insertions(+)

diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
index 35b402845a3..9082e3a266d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
index 7a6252a880b..1db77b886b3 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
index 964e14577a3..1b90955aea5 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
index 02a3cd3aec9..6fec495fff6 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
index def3647b886..3ba05595ca7 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
index f807d347fe8..a8b48e10c4d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
index 7d006de5346..fb99e8bdca6 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
index 445d9c51f01..fd7bcdf267d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
index a9fc1aa3529..9308a260e55 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
index 2f56c7944d0..95bd3a65602 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
index 43b26f74ff8..9722b7e59eb 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
index b5fa8b481f7..b507dfa67b6 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
index 60d0a305628..4071f8d9dd2 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
index 213f236e0a2..bf4202a6e6d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
index 6bf2971b718..7cfc255fec0 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
index 715c87e2f89..1c7a234994d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
index 008cbc08efd..7a43a9ccb44 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
index 44016b967a3..ac06d673a00 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
index 75fe2a3b030..7e7d56cd482 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
index 6c831bd98d7..e94ed92a2a4 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
index 7aef70f10b8..9b387ed9c45 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
index bef180f17cd..c8fef3a2b6d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
index a22cde8610c..77d361c7f42 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
index 138174d456e..f2f5d407a38 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
index 7329690e8a5..426faf5a0fb 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
index 16fe1f2aed6..8c109f2567c 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
index 2160206d55c..529e67c63eb 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
index 2008cf631e3..39be1898a2a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
index 998aff39722..e7dbb36f143 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
index b22663b4aa6..418eb777276 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB32",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
index c6b69c67539..0dadd9fb97c 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
index 3bbc9639558..2b9a23197b5 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "GD57",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MZ7KM240HMHQ0D3",
       "size": 240057409536,
@@ -184,6 +185,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-4",
       "device": "sdb",
       "firmware_version": "GD57",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MZ7KM480HMHQ0D3",
       "size": 480103981056,
@@ -195,6 +197,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-5",
       "device": "sdc",
       "firmware_version": "DB34",
+      "id": "disk2",
       "interface": "SATA",
       "model": "ST4000NM0265-2DC",
       "size": 4000787030016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
index 29a52ad347b..4417dd4bd7e 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
index c388e36263e..b9d994aae54 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
index 437f0c1ef21..17b8f0eecda 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
index b7258ba042b..1cde08abd6a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
index a960f389a45..38695c767fa 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
index c5016b7ae22..f17a90f94b5 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
index b3ef8284b21..6aa22937b39 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
index b32c87ea5c1..ffdc346c317 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
index b5456d74b20..8cb6fd7b30e 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
index f983f15f282..ce23cd2f538 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
index 76f18d365f7..f84c2b30919 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE32",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
index 0d336c51fab..d19b21cede1 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
@@ -290,6 +290,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-1",
       "device": "sda",
       "firmware_version": "BE33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
@@ -301,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0009:04:00.0-ata-2",
       "device": "sdb",
       "firmware_version": "BE33",
+      "id": "disk1",
       "interface": "SATA",
       "model": "ST1000NX0313",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
index 808cdf576e2..d084768fe6a 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
@@ -181,6 +181,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -192,6 +193,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.36314130522024320025384100000004",
       "by_path": "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk1",
       "interface": "NVME",
       "model": "Dell Ent NVMe AGN MU AIC 1.6TB",
       "size": 1600321314816,
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
index c5f28877c71..e92a8525b72 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
@@ -181,6 +181,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -192,6 +193,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.36314130522024170025384100000004",
       "by_path": "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk1",
       "interface": "NVME",
       "model": "Dell Ent NVMe AGN MU AIC 1.6TB",
       "size": 1600321314816,
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
index 84cff05f043..7f714bdfb17 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
@@ -181,6 +181,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -192,6 +193,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.36314130522024410025384100000004",
       "by_path": "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk1",
       "interface": "NVME",
       "model": "Dell Ent NVMe AGN MU AIC 1.6TB",
       "size": 1600321314816,
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
index a7716b438f5..a2aba694e2c 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
@@ -181,6 +181,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -192,6 +193,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.36314130522023450025384100000004",
       "by_path": "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk1",
       "interface": "NVME",
       "model": "Dell Ent NVMe AGN MU AIC 1.6TB",
       "size": 1600321314816,
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
index 6d56a9b12ea..abaa89d047d 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
@@ -213,6 +213,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -224,6 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "NT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -236,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "NT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -248,6 +251,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "NT32",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -259,6 +263,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bad",
       "by_path": "/dev/disk/by-path/pci-0000:59:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk4",
       "interface": "NVME",
       "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
       "size": 1600321314816,
@@ -269,6 +274,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb3",
       "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
       "device": "nvme1n1",
+      "id": "disk5",
       "interface": "NVME",
       "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
       "size": 1600321314816,
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
index beb85096d5f..1e5706f3035 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
@@ -213,6 +213,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -224,6 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "NT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -236,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "NT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -248,6 +251,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "NT32",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -259,6 +263,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.0025389671000baf",
       "by_path": "/dev/disk/by-path/pci-0000:59:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk4",
       "interface": "NVME",
       "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
       "size": 1600321314816,
@@ -269,6 +274,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.0025389571001020",
       "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
       "device": "nvme1n1",
+      "id": "disk5",
       "interface": "NVME",
       "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
       "size": 1600321314816,
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
index b93391a548b..8edd6f3004d 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
@@ -213,6 +213,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL65",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -224,6 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "NT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -236,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "NT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -248,6 +251,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "NT32",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -259,6 +263,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb6",
       "by_path": "/dev/disk/by-path/pci-0000:59:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk4",
       "interface": "NVME",
       "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
       "size": 1600321314816,
@@ -269,6 +274,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.002538957100101f",
       "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
       "device": "nvme1n1",
+      "id": "disk5",
       "interface": "NVME",
       "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
       "size": 1600321314816,
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
index 8754fbdd5e7..16602aefc79 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
@@ -213,6 +213,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -224,6 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "NT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -236,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "NT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -248,6 +251,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "NT32",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST2000NX0463",
       "reservation": true,
@@ -259,6 +263,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.002538957100101b",
       "by_path": "/dev/disk/by-path/pci-0000:59:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk4",
       "interface": "NVME",
       "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
       "size": 1600321314816,
@@ -269,6 +274,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb5",
       "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
       "device": "nvme1n1",
+      "id": "disk5",
       "interface": "NVME",
       "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
       "size": 1600321314816,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
index 0dd0cca2a87..0e2a1266632 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
index e52528269ba..c11267bc676 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "KT37",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MP0036",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
index db22c6b7189..8848f5b3a17 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
index 7ea6b12b576..6ef73486665 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
index 6b5a5dff84b..eb02154b9bf 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
index 771337402e6..c21b1a08943 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
index de128891410..061b8b0cd36 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
index ef25fe4987d..b8a4206bebf 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
index 40f3c9f8d33..fd8c73ed948 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
index 075f9d37569..33ba15239b0 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
index 5024672e6cd..012b5f3944e 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
index 67283fb5e3e..1c741b436c8 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
index 0e6b9d1e26a..4f09e86ca0c 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
index aafd47606bb..44641f8c6ef 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
index 2335bd4781c..b4e39e7d887 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "VT33",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "VT33",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST300MP0005",
       "size": 300000000000,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json
index 54c9b75aa49..9a42a8ab4a6 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json
@@ -268,6 +268,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AS0E",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX05SVB048Y",
       "size": 480103981056,
@@ -279,6 +280,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "DT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -291,6 +293,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json
index 29427dbb768..7ec8ad681f1 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json
@@ -268,6 +268,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AS0E",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX05SVB048Y",
       "size": 480103981056,
@@ -279,6 +280,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "DT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -291,6 +293,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json
index b28420edc99..2a7e463463d 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json
@@ -268,6 +268,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AS0E",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX05SVB048Y",
       "size": 480103981056,
@@ -279,6 +280,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "DT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -291,6 +293,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json
index 7922b2367d3..0058df9c083 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json
@@ -268,6 +268,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AS0E",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX05SVB048Y",
       "size": 480103981056,
@@ -279,6 +280,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "DT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -291,6 +293,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json
index 321dd2f3061..bad3fac3a75 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json
@@ -268,6 +268,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AS0E",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX05SVB048Y",
       "size": 480103981056,
@@ -279,6 +280,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "DT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -291,6 +293,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json
index 3aaa1524e4f..90893262db2 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json
@@ -268,6 +268,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AS0E",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX05SVB048Y",
       "size": 480103981056,
@@ -279,6 +280,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "DT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -291,6 +293,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json
index 1363f0ecd3d..200424e88b3 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json
@@ -268,6 +268,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AS0E",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX05SVB048Y",
       "size": 480103981056,
@@ -279,6 +280,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "DT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -291,6 +293,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json
index 7ad4220c113..fb40f01f3fd 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json
@@ -268,6 +268,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AS0E",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX05SVB048Y",
       "size": 480103981056,
@@ -279,6 +280,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "DT32",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -291,6 +293,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
index 395d4a2d585..4c934db8762 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
@@ -258,6 +258,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
@@ -269,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
+      "id": "disk1",
       "interface": "SAS",
       "model": "PX04SMB040",
       "reservation": true,
@@ -281,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
+      "id": "disk2",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
@@ -293,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
+      "id": "disk3",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
index 522fd358a9a..619e178798a 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
@@ -258,6 +258,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
@@ -269,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
+      "id": "disk1",
       "interface": "SAS",
       "model": "PX04SMB040",
       "reservation": true,
@@ -281,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
+      "id": "disk2",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
@@ -293,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
+      "id": "disk3",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
index eea5a90d292..dbd135b415f 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
@@ -258,6 +258,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
@@ -269,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
+      "id": "disk1",
       "interface": "SAS",
       "model": "PX04SMB040",
       "reservation": true,
@@ -281,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
+      "id": "disk2",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
@@ -293,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
+      "id": "disk3",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
index 20548384568..c3ee65844c5 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
@@ -258,6 +258,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
@@ -269,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
+      "id": "disk1",
       "interface": "SAS",
       "model": "PX04SMB040",
       "reservation": true,
@@ -281,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
+      "id": "disk2",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
@@ -293,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
+      "id": "disk3",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
index a7978d49aff..41f546d7334 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
@@ -258,6 +258,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
@@ -269,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
+      "id": "disk1",
       "interface": "SAS",
       "model": "PX04SMB040",
       "reservation": true,
@@ -281,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
+      "id": "disk2",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
@@ -293,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
+      "id": "disk3",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
index 54363251369..3bf3f281bf2 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
@@ -258,6 +258,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
@@ -269,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
+      "id": "disk1",
       "interface": "SAS",
       "model": "PX04SMB040",
       "reservation": true,
@@ -281,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
+      "id": "disk2",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
@@ -293,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
+      "id": "disk3",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
index 0d75ba72aac..a34239277ab 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
@@ -258,6 +258,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
@@ -269,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
+      "id": "disk1",
       "interface": "SAS",
       "model": "PX04SMB040",
       "reservation": true,
@@ -281,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
+      "id": "disk2",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
@@ -293,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
+      "id": "disk3",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
index fe599608257..158d3c64d9c 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
@@ -258,6 +258,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
@@ -269,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
+      "id": "disk1",
       "interface": "SAS",
       "model": "PX04SMB040",
       "reservation": true,
@@ -281,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
+      "id": "disk2",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
@@ -293,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
+      "id": "disk3",
       "interface": "SATA",
       "model": "TOSHIBA MG04ACA4",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json
index 75c7e4fc86a..5271ba6c91e 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json
@@ -288,6 +288,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5C",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -299,6 +300,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "SCV1DL58",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "reservation": true,
@@ -311,6 +313,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -323,6 +326,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "DT32",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -335,6 +339,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "DT32",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -347,6 +352,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "DT32",
+      "id": "disk5",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json
index fe4b13db0f8..59e0b67c046 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json
@@ -288,6 +288,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5C",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -299,6 +300,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "SCV1DL58",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "reservation": true,
@@ -311,6 +313,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -323,6 +326,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "EG03",
+      "id": "disk3",
       "interface": "SAS",
       "model": "MG04SCA40ENY",
       "reservation": true,
@@ -335,6 +339,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "DT32",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -347,6 +352,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "DT32",
+      "id": "disk5",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json
index 9a8de4e18c9..aad69f4d45f 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json
@@ -288,6 +288,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5C",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -299,6 +300,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "SCV1DL58",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "reservation": true,
@@ -311,6 +313,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "EG03",
+      "id": "disk2",
       "interface": "SAS",
       "model": "MG04SCA40ENY",
       "reservation": true,
@@ -323,6 +326,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "EG03",
+      "id": "disk3",
       "interface": "SAS",
       "model": "MG04SCA40ENY",
       "reservation": true,
@@ -335,6 +339,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "EG03",
+      "id": "disk4",
       "interface": "SAS",
       "model": "MG04SCA40ENY",
       "reservation": true,
@@ -347,6 +352,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "EG03",
+      "id": "disk5",
       "interface": "SAS",
       "model": "MG04SCA40ENY",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json
index 3ebe5136080..b88e980a88c 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json
@@ -288,6 +288,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5C",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -299,6 +300,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "SCV1DL58",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "reservation": true,
@@ -311,6 +313,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -323,6 +326,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "DT32",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -335,6 +339,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "DT32",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -347,6 +352,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "DT32",
+      "id": "disk5",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json
index d6ff5bc657f..be2e123a021 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json
@@ -288,6 +288,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5C",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -299,6 +300,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "SCV1DL58",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "reservation": true,
@@ -311,6 +313,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -323,6 +326,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "DT32",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -335,6 +339,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "DT32",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -347,6 +352,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "DT32",
+      "id": "disk5",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json
index c05769abbf3..1ffc30fd0ca 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json
@@ -288,6 +288,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5C",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -299,6 +300,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "SCV1DL58",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "reservation": true,
@@ -311,6 +313,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "DT32",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -323,6 +326,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "DT32",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -335,6 +339,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "DT32",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
@@ -347,6 +352,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "DT32",
+      "id": "disk5",
       "interface": "SAS",
       "model": "ST4000NM0295",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json
index a672eb11740..aca374cf056 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json
@@ -288,6 +288,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5C",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -299,6 +300,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "SCV1DL58",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "reservation": true,
@@ -311,6 +313,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "KU27",
+      "id": "disk2",
       "interface": "SAS",
       "model": "HUS726040ALS210",
       "reservation": true,
@@ -323,6 +326,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "KU27",
+      "id": "disk3",
       "interface": "SAS",
       "model": "HUS726040ALS210",
       "reservation": true,
@@ -335,6 +339,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "KU27",
+      "id": "disk4",
       "interface": "SAS",
       "model": "HUS726040ALS210",
       "reservation": true,
@@ -347,6 +352,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "KU27",
+      "id": "disk5",
       "interface": "SAS",
       "model": "HUS726040ALS210",
       "reservation": true,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json
index 86884d56f28..0eca09b7cc0 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json
@@ -288,6 +288,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "SCV1DL5C",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "size": 480103981056,
@@ -299,6 +300,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "SCV1DL58",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SSDSC2KG480G7R",
       "reservation": true,
@@ -311,6 +313,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "KU27",
+      "id": "disk2",
       "interface": "SAS",
       "model": "HUS726040ALS210",
       "reservation": true,
@@ -323,6 +326,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "KU27",
+      "id": "disk3",
       "interface": "SAS",
       "model": "HUS726040ALS210",
       "reservation": true,
@@ -335,6 +339,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "KU27",
+      "id": "disk4",
       "interface": "SAS",
       "model": "HUS726040ALS210",
       "reservation": true,
@@ -347,6 +352,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "KU27",
+      "id": "disk5",
       "interface": "SAS",
       "model": "HUS726040ALS210",
       "reservation": true,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
index 0e6cb7611c9..f11e7297c34 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
index e4e79c567b9..0cbadcc3854 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
index 56e59815845..a014afcad7b 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
index a40e9e61fe0..42ed1cb77c6 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
index 1956e6d4e8c..f2ec967405d 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
index df6439d1e4a..5154db7ed33 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
index 5192610568a..6ad8db94d26 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
index 66205590b0f..951497119d8 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
index 1f349484e2c..a8ad3950e20 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
index 0c0e94f7dde..04231aa68c5 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
index 09c9607616f..a5b7ed1d9a0 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
index fa6d2f046d0..aeedd786bf3 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
index cd6c85d01ad..1b9aa614fd6 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
index 3f8079b0d97..3ea91256034 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
@@ -202,6 +202,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "AA08",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST9250610NS",
       "size": 250059350016,
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
index 1ce4011ce80..7e3774bf21f 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
@@ -318,6 +318,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:14:0",
       "device": "sda",
       "firmware_version": "GXM5104Q",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SAMSUNG MZ7KM480",
       "size": 480103981056,
@@ -329,6 +330,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
       "device": "sdb",
       "firmware_version": "GXT5204Q",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SAMSUNG MZ7LM1T9",
       "reservation": true,
@@ -341,6 +343,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
       "device": "sdc",
       "firmware_version": "GXT5204Q",
+      "id": "disk2",
       "interface": "SATA",
       "model": "SAMSUNG MZ7LM1T9",
       "reservation": true,
@@ -353,6 +356,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0",
       "device": "sdd",
       "firmware_version": "GXT5204Q",
+      "id": "disk3",
       "interface": "SATA",
       "model": "SAMSUNG MZ7LM1T9",
       "reservation": true,
@@ -365,6 +369,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
       "device": "sde",
       "firmware_version": "GXT5204Q",
+      "id": "disk4",
       "interface": "SATA",
       "model": "SAMSUNG MZ7LM1T9",
       "reservation": true,
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index dabc39c22a2..5b9d28e2a59 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -318,6 +318,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:14:0",
       "device": "sda",
       "firmware_version": "GXM5104Q",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SAMSUNG MZ7KM480",
       "size": 480103981056,
@@ -329,6 +330,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
       "device": "sdb",
       "firmware_version": "GXT5204Q",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SAMSUNG MZ7LM1T9",
       "reservation": true,
@@ -341,6 +343,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
       "device": "sdc",
       "firmware_version": "GXT5204Q",
+      "id": "disk2",
       "interface": "SATA",
       "model": "SAMSUNG MZ7LM1T9",
       "reservation": true,
@@ -353,6 +356,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0",
       "device": "sdd",
       "firmware_version": "GXT5204Q",
+      "id": "disk3",
       "interface": "SATA",
       "model": "SAMSUNG MZ7LM1T9",
       "reservation": true,
@@ -365,6 +369,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
       "device": "sde",
       "firmware_version": "GXT5204Q",
+      "id": "disk4",
       "interface": "SATA",
       "model": "SAMSUNG MZ7LM1T9",
       "reservation": true,
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
index 0deb5b8dd9b..0396fce1c6e 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D02",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
@@ -199,6 +200,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-2",
       "device": "sdb",
       "firmware_version": "01.01D02",
+      "id": "disk1",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
@@ -210,6 +212,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-3",
       "device": "sdc",
       "firmware_version": "01.01D02",
+      "id": "disk2",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
index 046259a74b3..a619534ed1b 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D02",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
@@ -199,6 +200,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-2",
       "device": "sdb",
       "firmware_version": "01.01D02",
+      "id": "disk1",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
@@ -210,6 +212,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-3",
       "device": "sdc",
       "firmware_version": "01.01D02",
+      "id": "disk2",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
index 1692e25e736..9634cf59e9e 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D02",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
@@ -199,6 +200,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-2",
       "device": "sdb",
       "firmware_version": "01.01D02",
+      "id": "disk1",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
@@ -210,6 +212,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-3",
       "device": "sdc",
       "firmware_version": "01.01D02",
+      "id": "disk2",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
index 764d9b43af9..e336a3fc243 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D02",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
@@ -199,6 +200,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-2",
       "device": "sdb",
       "firmware_version": "01.01D02",
+      "id": "disk1",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
@@ -210,6 +212,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-3",
       "device": "sdc",
       "firmware_version": "01.01D02",
+      "id": "disk2",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
index 186aa43ed2c..ec5c79874ec 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304e5312830025384100000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
index 3018cebb74b..535f5c011b2 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304e6826320025384100000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
index be852096411..cdb447ecc38 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304ea214240025384300000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
index ff804d52ece..d39f5d738d3 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304e6825260025384100000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
index 81b1e65a051..42896509c9a 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304e6826350025384100000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
index 7fc920b7793..fd8794b3801 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304ea214070025384300000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
index 49a39e5d7aa..d97683edaba 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304e5310840025384100000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
index 6f7a74719d8..7ddf9c693e2 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304e5312770025384100000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
index 5da0a396d92..678af299b8b 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304e6826420025384100000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
index 17ee613fdf7..323f12b8418 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
@@ -270,6 +270,7 @@
       "by_id": "/dev/disk/by-id/nvme-eui.343336304e5312000025384100000001",
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-nvme-1",
       "device": "nvme0n1",
+      "id": "disk0",
       "interface": "NVME",
       "model": "SAMSUNG MZ1LB1T9HALS-00007",
       "size": 1920383410176,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
index 149133cbf1f..eb859a6fb56 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
index fdf4ef6db05..31222ff6b06 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
index bb751e49cf3..be5f7c6da34 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
index 9e764774a8d..08571aff8c2 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
index bfaf3f78cf9..7d054b792e2 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
index 63294535cc9..677901772eb 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
index b31626157f0..fa8cc4e2a1d 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
index b83fe794afd..5f9967b7942 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
index 0ac015a8cb7..737299d1742 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
index 0b11df399e4..e628267735f 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
index 5e19b5f8d68..cacd62939b0 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
index 244cf7d928f..abc3f40583a 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
index a8fd8e075e0..58cc57b0d07 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
index 131a77507c5..333f3ae1cea 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
index 589aabed176..39ebeadd93d 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
index 84b90bb35b9..815eaa971ad 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
index e438ddc890b..06b482ad03c 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
index 75a7152ca14..6083e159145 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
index 255441c85e6..2442fa9c9f4 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
index b2b432b5eb3..1070d9119b5 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
index 2fb4076969f..0abb6ef3a29 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
index 68fc94963b4..b463760362a 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
index 36f551c5d2f..718c5e02f50 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
@@ -220,6 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
index dd67c9e9f04..b3f7e8ad814 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
index 9bf5a847ea0..0b5ea11e8bc 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
index 046c7b5713f..fd20a815a1e 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
index a8dbb8529c7..bccf98d504f 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
index a593bbccea5..690e5d4e0c0 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
@@ -179,6 +179,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0",
       "device": "sda",
       "firmware_version": "RVT02B6Q",
+      "id": "disk0",
       "interface": "SATA",
       "model": "Samsung SSD 860",
       "size": 250059350016,
@@ -190,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0",
       "device": "sdb",
       "firmware_version": "RVT02B6Q",
+      "id": "disk1",
       "interface": "SATA",
       "model": "Samsung SSD 860",
       "size": 250059350016,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
index 7d9c647efb0..cfaec073007 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
@@ -179,6 +179,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0",
       "device": "sda",
       "firmware_version": "RVT02B6Q",
+      "id": "disk0",
       "interface": "SATA",
       "model": "Samsung SSD 860",
       "size": 250059350016,
@@ -190,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0",
       "device": "sdb",
       "firmware_version": "RVT02B6Q",
+      "id": "disk1",
       "interface": "SATA",
       "model": "Samsung SSD 860",
       "size": 250059350016,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
index 4896dbe3e72..4babe97fbde 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
@@ -179,6 +179,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0",
       "device": "sda",
       "firmware_version": "RVT02B6Q",
+      "id": "disk0",
       "interface": "SATA",
       "model": "Samsung SSD 860",
       "size": 250059350016,
@@ -190,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0",
       "device": "sdb",
       "firmware_version": "RVT02B6Q",
+      "id": "disk1",
       "interface": "SATA",
       "model": "Samsung SSD 860",
       "size": 250059350016,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
index 4c878e11085..7ec9dea1bc5 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
@@ -179,6 +179,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0",
       "device": "sda",
       "firmware_version": "RVT02B6Q",
+      "id": "disk0",
       "interface": "SATA",
       "model": "Samsung SSD 860",
       "size": 250059350016,
@@ -190,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0",
       "device": "sdb",
       "firmware_version": "RVT02B6Q",
+      "id": "disk1",
       "interface": "SATA",
       "model": "Samsung SSD 860",
       "size": 250059350016,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
index b713a31d18e..608dd6e32ce 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 8,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373307LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
index 70a4081cebf..7b6e6a8c95b 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 8,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373307LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
index ed9bcec9802..72752c2c148 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
index bc1badc82e4..83591307f00 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
index 4ee7e0aad89..ab752ee4dd4 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
index 169317bf30c..e8f92f2cdf9 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
index fe83034787f..5d4a9927f3a 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 104,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "MAT3073NC",
       "size": 73543163904,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
index a613c286603..e2da22078a2 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
index b127b975517..cb8c76ce29c 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
index 531fdac72ed..3b13bf162b7 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
index 72bc831b1cb..c28089d5210 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
index 370c84a1efc..51877ac486b 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
index d273e8177ec..7ffe4d9eb77 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
index 77bb02ea120..ed7e35f9565 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
@@ -163,6 +163,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": 2,
+      "id": "disk0",
       "interface": "SCSI",
       "model": "ST373207LC",
       "size": 73407868928,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
index 0f7322a0f2c..b33f35a09b5 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
index d805abed233..d6500c0242e 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
index a8ec07c6431..ec35fe09632 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
index e2e2e222dc3..a0b8a42fd7b 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
index 1a7caaff272..9e6e3a782b9 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
index a73b661d22d..01f841078d7 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
index e18ce1ea956..a08c1604599 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
index 71c0dab73e9..48444b78e48 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
index 8ae0e3d5a0d..713926b2eb8 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
index c65087be076..f1fd16c3863 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
index b20c187a740..e97fb52917c 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
index 5e6d9d5d13b..4ae0f4b49f4 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
index d60cff2b3ee..d5093d384f8 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
@@ -226,6 +226,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 3.13,
+      "id": "disk0",
       "interface": "RAID-0 (2 disks)",
       "model": "PERC H710",
       "size": 598879502336,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
index b31ef3455dd..dfdb5664bf1 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
index 10bea93d039..14e15b4e5c0 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
index 253c4df679e..9ff3a493ea4 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
index 861cef5ea3d..9cc95778d4b 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
index 89db44ff91f..325607f1151 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
index f44f81c9aa2..46b16295d1b 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
index fa856d3db33..0140c28fa2b 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
index 66d25d11189..aede8ea1826 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
index 44c0cffd708..1f62b58537f 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
index c559214753f..bdde24a4648 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
index 08ab2f1254d..aaf6520776e 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
index ad2af08d0e0..281e797b90e 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
index f1cc2c6f810..7736b8327f4 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
@@ -235,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
index 4e00407fb3f..78920e50314 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
index d696f2a10fa..e7c1ab49a74 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
index f4d20be52ac..c34ef11de5b 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
index e9412d910a2..8e01ac223f5 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
index 2ec9fcc29a1..5c122c9a4b1 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
index 0a6f9c7fa23..510ee7068cd 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
index 492fcf5dc54..b7ecdf4f746 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
index 59836b659c6..44ceb230270 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
index de10ffb9f83..381202a17c1 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
index 17a46bc0da4..50d7eebc5e4 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
index bc18e57154d..764bc282701 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
index 308afd24736..edd8774810c 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
index 0cdf951e174..d4203552085 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
index b6d51fa0355..1a108c0af5b 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
index a039b079322..31300dc4863 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
index 8f3c2423ab4..a590a3e6f69 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
@@ -250,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -261,6 +262,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
index 32c9546bc80..cd17d326fb7 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
@@ -239,6 +239,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-1 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
index e0a896e3a4b..734b48b14fb 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
@@ -239,6 +239,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-1 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
index 868321cfff3..15c8b5588f8 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
@@ -239,6 +239,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-1 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
index 3b236a6d28d..5b56bf15d27 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
@@ -239,6 +239,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-1 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
index 1c88b5d7bd2..1a71087d0a4 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
@@ -239,6 +239,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-1 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
index 9bd795e512e..5e7dbc4984d 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
@@ -239,6 +239,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "RAID-1 (2 disks)",
       "model": "PERC H330 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
index 71a7da290a5..c50170aead2 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
@@ -236,6 +236,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D201DL13",
+      "id": "disk0",
       "interface": "SATA",
       "model": "INTEL SSDSC2BB30",
       "size": 300069052416,
@@ -247,6 +248,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D201DL13",
+      "id": "disk1",
       "interface": "SATA",
       "model": "INTEL SSDSC2BB30",
       "size": 300069052416,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
index 6de1b66dc7c..b4bca84b945 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
@@ -236,6 +236,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D201DL13",
+      "id": "disk0",
       "interface": "SATA",
       "model": "INTEL SSDSC2BB30",
       "size": 300069052416,
@@ -247,6 +248,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D201DL13",
+      "id": "disk1",
       "interface": "SATA",
       "model": "INTEL SSDSC2BB30",
       "size": 300069052416,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
index a4952b8f05b..b9c524479d6 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
@@ -236,6 +236,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D201DL13",
+      "id": "disk0",
       "interface": "SATA",
       "model": "INTEL SSDSC2BB30",
       "size": 300069052416,
@@ -247,6 +248,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D201DL13",
+      "id": "disk1",
       "interface": "SATA",
       "model": "INTEL SSDSC2BB30",
       "size": 300069052416,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
index af5008abc57..6fdbb44a129 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
@@ -236,6 +236,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D201DL13",
+      "id": "disk0",
       "interface": "SATA",
       "model": "INTEL SSDSC2BB30",
       "size": 300069052416,
@@ -247,6 +248,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D201DL13",
+      "id": "disk1",
       "interface": "SATA",
       "model": "INTEL SSDSC2BB30",
       "size": 300069052416,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
index a16762e924c..1c9fa8eb308 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
index 873bea11744..a034aa0b2ff 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
index f68b2817219..362f9d61350 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
index 3c6eebfed86..f783cec1b38 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
index 6fc202ac5a7..6bc0d13db93 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
index a255b7586da..4f7c0b79528 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
index 29ccef08905..9f705ecfc9f 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
index 3450ad2a67e..0fa8d19ee1b 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
index 969abbd03eb..732c5effaa0 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
index ed104ff1d37..c28b8aedb2d 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
index c29173472a5..056e0391d81 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
index 003d83a4133..60ca9660ab2 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
index 466e2e5456e..94a082bc41c 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
index 5abc5091f81..9b2b6d24750 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
index e35ef72441f..83638f83402 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
index 2cc6ccb06fd..abff90351ae 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
@@ -223,6 +223,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "XCV1DL67",
+      "id": "disk0",
       "interface": "SATA",
       "model": "SSDSC2KG480G8R",
       "size": 480103981056,
@@ -234,6 +235,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "PT54",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST8000NM0185",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
index d1e4b169549..baddf9e37b8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GA0F",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NM0033-9ZM",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
index 3a60c1fa815..481bbbe0e0d 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
index b0f8f4917b6..4f58d9286e1 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
index 0f1692592ef..bcaa223c1ba 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
index 60cbb4b8d99..b3b1e790d29 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
index e151ef0669a..b8a224f67e8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
index 69e7e516655..17f8c85344f 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
index ac722886cbd..6ae1ee0b79b 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
index efab59eaf31..76a7b8ac837 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
index 3abceda92c0..28f277fa8d2 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GA06",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NM0033-9ZM",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
index 1fa79e861c2..183b85589f0 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
index 7ff033b05fb..c4fd1feff01 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
index 81333550296..f74e3d0dab2 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
index fd9eb8a3177..e0f611106a8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
index 04aa76853f6..941e88ccdf1 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
index 7d0ba56cd39..4d4e0630471 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
index 11cd6270252..5422f049704 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
index 16d4f97f213..9d95ad43974 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
index c3965f5e56c..1f96d59b806 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
index 17aa08f659d..ca94387fa73 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
index 734a043ff01..004bbd56475 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
index b61bdc57b48..6feccb358bf 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
index 3f5b132d0dc..d529fda2b15 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
index 5d259cbb327..8359f775ecf 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GA10",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NM0033-9ZM",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
index 5476b7490ef..c900bf32ce9 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
index a702389729e..732ae33c699 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
index 2e678805df2..2bda575f3c0 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
index 7c671cb4200..82b40319948 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
index 0ec528d38b6..e6bcea44bb3 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
index 20156db903d..cffe57b878b 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
index ea1663cea44..1b093d3e06c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
index 7a43423547d..e67c668eb32 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
index 9694960e16f..2a90b058834 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
index 7a2c2d46310..1836c98dcc2 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
index dfd46e15a52..11f6959b683 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
index 65c33d7efdb..b8df124e3a6 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
index b6a52f6b6c8..781dd4b9e5f 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
index b322800cf24..ae72433c86b 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
index 6383bbbfd4f..df6b6901de7 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
index e676826c9d1..4430a1edcf0 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
index 477c7ec8697..2187d2e380a 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GA10",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NM0033-9ZM",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
index 32a1863ac4f..89cf1e9bad6 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
index 353a415978a..ae4d8a39a51 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GA10",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NM0033-9ZM",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
index 1016fbce4b0..a96430ec3c4 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
index 13708f229b8..d4dc253d581 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
index 6d0c5d3bb21..8bedb27be08 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GA0F",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NM0033-9ZM",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
index 31f46948b45..92e51df535d 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01V03",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD1003FBYX-1",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
index 46fc5589f31..967fc23eb31 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
index 5d862b1edb1..8142e32a368 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
index 89f82e2eff1..4ce1ee19bf3 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
index 7b3fdcd9082..7470ff4d6a7 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
index b8efe240d74..b527f50cb19 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
index eb24d13c464..98a38d1f2e9 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
index 1ca56465843..bcead6fe760 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
index 809318fe78a..b5cee803745 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
index d0c7b062c6a..1b67d359a8a 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
index 51ea2ffaa17..543bdf8f03e 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
index 8c8a4abe9a5..91b0818d295 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
index 8172c6f371c..1a7a2abc1e7 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
index 92af910250c..33011efb758 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
index 11775a37d0f..1fe9b9543ef 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
@@ -233,6 +233,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
@@ -244,6 +245,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
       "device": "sdb",
       "firmware_version": 4.3,
+      "id": "disk1",
       "interface": "SAS",
       "model": "PERC H730 Mini",
       "size": 299439751168,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
index 3dc0e9168e7..12eece8f8ed 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "NA07",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0423",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
index bbc3a6b6526..a41d2a23eed 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "NA07",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0423",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
index 29299481394..69fd42e25fd 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "NA07",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0423",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
index 12b9d7d8471..9890aae6da5 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "NA07",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0423",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
index 2b6fb41c8fc..b52a457d7e4 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "NA07",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0423",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
index e7202fed3ff..a810798ea04 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "NA07",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0423",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
index f2a68ea03b0..52089e1cf99 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -405,6 +407,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -417,6 +420,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -429,6 +433,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -441,6 +446,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
index 76f17f69bd7..63593bfb03e 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -405,6 +407,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -417,6 +420,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -429,6 +433,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -441,6 +446,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
index 4744fe0a228..6dd687065c7 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -405,6 +407,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -417,6 +420,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -429,6 +433,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -441,6 +446,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
index f0fd5dc095c..ca5b0a138a5 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -405,6 +407,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -417,6 +420,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -429,6 +433,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -441,6 +446,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
index 592d7be1548..b3f8e82e51c 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -405,6 +407,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -417,6 +420,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -429,6 +433,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -441,6 +446,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
index 1cc73faf604..b4f5ba2e9be 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -405,6 +407,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -417,6 +420,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -429,6 +433,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -441,6 +446,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
index dd279e20896..d9797378641 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -405,6 +407,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -417,6 +420,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -429,6 +433,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -441,6 +446,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
index 462cc4b6dbf..fe0d2fed2a0 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -405,6 +407,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -417,6 +420,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -429,6 +433,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0088",
       "reservation": true,
@@ -441,6 +446,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
index 58fce14a1ff..a67ad0e746f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
index 878b859851a..03faef29a94 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
index 84028ef0e18..90b811be252 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
index cd00c10ecf1..d03cc04bd12 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
index f2efcd18fe7..a2b14d82183 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
index ea13d177906..d0fe2436d9b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
index 21d145bb1c0..45a6c518029 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
index c73db22798e..d91e6cc3210 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
index 95d200e249e..ae7e2229046 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
index 08fd4fe0e5c..af7a7b05e96 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
index 995dc3ff926..62ca8104249 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
index 7b50f9a682b..f8b5aa8b9b6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
index c9ff7220a45..8ad24e8ad7b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
index 823412d5d04..69e19791ece 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
index 7b7088ed031..ecc8b0411ff 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
index 8d6f56a3eec..627695ce43a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
index 6c99f622e4d..6c51fdad0db 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
index 4ebd0cc61e0..45fada9ba68 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
index c3e3371d97b..642b18a10c8 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
index 26587a428db..c4c53002e41 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
index 02bfa9253fb..a50eb89fef7 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
index 1ff78676bee..e5d93a049dc 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
index 27b62da3ba0..63c2fb534aa 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
index 6dda60d21f2..1ee61a14621 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
index c8fb2305bcc..89928075aa4 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
index eec787c6cf0..257e5a5aade 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
index 639ad9b30ed..03c8acb05b8 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
index 077c7a8d9ca..6996c00f0f0 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
index 7857e566592..228daa083bd 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
index 44fbdb93fbe..1dc6387c093 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
index 0a4708cb596..dc35c13f15c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
index ccfa47c8df6..70321827af1 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
index ab8e3bdefe2..e22934ce01a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
index dfc1f5d37f6..1b263b0cf19 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
index 94baaf3cb72..d4d1115959f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
index 5db0e464d51..79d0404890c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
index a6d071d3aaa..90b5cdf2b79 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
index fd837553557..50be2a5e914 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
index 6bdf824a5f0..3e689b3311e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
index 5863a2edd06..f3b8b18c458 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
index 7b02f8ef103..3d92d8213aa 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
index f03249f7d98..22f6c480439 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
index 28b48952cc2..c9ba05a234e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
index c1152589606..75095d018f2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
@@ -357,6 +357,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -368,6 +369,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
index a7ae61116a9..be043b4aa7e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
index b24f9511266..eb1f6af0296 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
index e85bb1c757f..fbc8384d557 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
@@ -382,6 +382,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -393,6 +394,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
index 209c1f3c559..ac81bae85c0 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
index 9321dbb6663..58847c55bdf 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
index d39b22fea0e..c1a957fb862 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
index 0190462a40a..836c72f544f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
@@ -401,6 +401,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
@@ -412,6 +413,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0088",
       "size": 600127266816,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json
index 3160558aa2d..52ecf6bd1a9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json
index 8bfd68d226b..07f8b1cafa7 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json
index ce21f5eb503..f01aa89def5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json
index e77746980e9..99f7527425d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json
index 15bebf31fa5..6b0d57e744d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json
index 2c75d13e9c1..53e445ea525 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json
index 803ba33457d..75e36229546 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json
index 94b8179966d..cafdcbb97b7 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json
index 265112dc3aa..0e2b8d0820f 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json
index 79932a9c0a6..8b069376bb0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json
index 7a1f3ae846f..09f5a2a615e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json
index e4758d28d62..63013d2c12e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json
index 3a1fdbce5a3..06d40026ebc 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json
index c5443ab03e8..aa77e3e8fb5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json
index 90c0831db22..b4351441b44 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json
index 1668e6c1764..5d66bbd39dd 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json
index 109f09015fe..b3a7ab29c86 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json
index 06cb68a9145..54c37ce1c80 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json
index 5dcbbb4cfc0..c8b0c96c6b1 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json
index 421866115ac..6b1114b5e4c 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json
index 6c47202c900..a27c51dd40d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json
index 324c395a24f..997010af8b8 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json
index bab0860fb48..776fdab1e4c 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json
index 320902099bc..a4c03e7e3d6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json
index 40630d0e19b..8f1d16adb04 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json
index 4fec86b706b..a10c870c847 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json
index 4454d6ab4e3..1b9bd0de117 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json
index 70e75d74df5..41e852e2a83 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json
index f56e505bd51..e5272dc6627 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json
index 6b1d9e59a3d..108a989f97b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json
index 77a7a1afb68..dfba1a63664 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json
index 73275d6d9d1..b9f81b4dce4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json
index 1431a185035..a5797c841ff 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json
index 05d2c3a2943..3f5cdce2e48 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json
index 0eeecba7be6..8da5118d2b7 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json
index 055687dea8a..18723f2e4fd 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json
index 597d7c14433..af088f33d20 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json
index 0a9be549ae1..5a6ead3738f 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json
index a48c2e24ebd..140aca35d4e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json
index 36b019ab301..e2cea8da237 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json
index d6e12f6653d..85c4904bfa6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json
index c63a902ddda..0f738c7c719 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json
index aa247865ada..05c1fa490d0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json
index 309be27e5f8..d82c45e55ec 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json
index 6e77ea1978b..dc7e925f770 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json
index 28e69710b43..b76194e1bf2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json
index 44bcacc61a5..e15b880080e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json
index e5fb8d9152b..b512437dcd3 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json
index b92c4b4a66f..a40a61eac5d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json
index 7170e3c7e0c..5f168915d24 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json
index aed7ce35ddc..52de7559b28 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json
index fc2a063c634..ee9088f6aa2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json
index 4ecdfb838f9..6b3d5391690 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json
index 8f1d87b6386..4657b8daa10 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json
index db93d963ba3..2ff1be06e91 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json
index 829d72efb27..cf8c1f57aa7 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json
index 07b839d12b4..594d9ce837e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json
index b7f813e334f..4dfe8011432 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json
index f5eadd675a1..03b56455d91 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json
index 9139ef524f2..885eda51ac2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json
index c0cf4f9f360..b9339e45899 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json
index db3c235a50b..d1087602e1d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json
index b0083429731..6ad88dd0128 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json
index 86963ab3d76..06f528e6186 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json
index 3e757eef4b8..94f32c679d0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json
index 43a4d07c6cb..fc3d039cad7 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json
index 2caaca6ca2a..41c065b0907 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json
index 7233ef95a27..95d0fb91017 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json
index 91b3a75d90c..cfbbe2c4347 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json
index 1dce9e59374..0a6b52b5bd5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json
index 243dc7b6717..5bd0447a34d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json
index 6a2c18bc719..1b5f324bbaa 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json
index 94d7ee101fb..d5e014d6a08 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json
index 2b277311ecb..0719cb56a6a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json
index f0377ff9e9d..a3f3d766be2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json
index b4c5bd81108..a1589abf0d4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json
index 73e7bb8d4c9..8963df25acf 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json
index 97a09ee8a97..fea6f0d759d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json
index 7cccabbcb37..ad726f54f9a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json
index 1f898a289e5..e3afeaf5d7f 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json
index 7549caab470..357d8ffd4ab 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json
index 7a2356c14ce..adc12407344 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json
index fb40630251f..25032f2b99d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json
index f718169e6ce..7857016c097 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json
index 50e65389cc5..53d3ee496a6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json
index 5b85081fe53..455dcf1c475 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json
index c2bc2b0ac35..f4cfc7bfa96 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json
index 79888aac94d..bfaa26a2b56 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json
index 4d7acc33bbc..8b4ed63edf7 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json
index 60291119bc0..15020144ea5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "XCV1DL67",
+      "id": "disk1",
       "interface": "SATA",
       "model": "SSDSC2KG960G8R",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json
index 71debb943df..be2f96b8a36 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json
index 53252f3c98a..571e3fedcc5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json
index 07a80077de1..73004de4d06 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json
index a78866bfacb..605e0b14f7b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json
index afd3afc0d4f..d8839882a94 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json
index da986200199..10d05c2ff1d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json
index 58ba30fbf84..c2b5b193b73 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json
index b926d373aef..80bcd56befe 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json
index bd260517f4c..0cca53c856b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json
index 85884d5d18e..23fbd6db036 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json
index 7e5db0e526f..005a3897287 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json
index 38c20493199..1604d2ed0af 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json
index e2c1b0a209b..52d3c184e36 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json
index 01b9bbee121..92a7e8ffec4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json
index 5fad9aa5c89..21dc8b2b89d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json
index 02338c834e4..c504aa5bdad 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json
index c3b19fd60e7..dca75e9f1d2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json
index eb91ef65eb5..e48dc98d705 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json
index 4fa3a8bc95b..75bd875cc8b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json
index a7f57877557..b98c34a7f8e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json
index 773da3f0930..da210e11e0a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json
index 02fd9875032..456df7d68a2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json
index 9b8d9af5afd..acffe53b88d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json
index 199e98b1814..ccdb726928f 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json
index 31a64dd0d19..6e05bad7038 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json
index 8222cc58601..8a87796f0cc 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json
index 1cdd8201257..3e911d65faf 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json
index 393963bea92..287fd6120ab 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json
index e567e884c84..da24af14555 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json
index 6a217451eea..9d5d93f9f00 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json
index 1177e1fb09d..1d7931f9570 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json
index f09f7ae9985..e5e1e4191f9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json
index 08892f7069f..7d8fe8e63d8 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json
index 77b9344aef8..4f282b16977 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json
@@ -210,6 +210,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "D1DF003",
+      "id": "disk0",
       "interface": "SATA",
       "model": "MTFDDAK480TDN",
       "size": 480103981056,
@@ -221,6 +222,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "D1DF003",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDN",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
index 99b9e6e96b9..da38d473f5b 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
@@ -203,6 +203,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": "B709",
+      "id": "disk0",
       "interface": "SAS",
       "model": "KRM5XVUG1T92",
       "size": 1920383410176,
@@ -214,6 +215,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:2:0",
       "device": "sdb",
       "firmware_version": "D3DJ004",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDT",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
index f97bd75b4e2..fd81d4ca78e 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
@@ -203,6 +203,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0",
       "device": "sda",
       "firmware_version": "B709",
+      "id": "disk0",
       "interface": "SAS",
       "model": "KRM5XVUG1T92",
       "size": 1920383410176,
@@ -214,6 +215,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:2:0",
       "device": "sdb",
       "firmware_version": "D3DJ004",
+      "id": "disk1",
       "interface": "SATA",
       "model": "MTFDDAK960TDT",
       "reservation": true,
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
index 7eb2431e3eb..32c64ff6ffd 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
@@ -225,6 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
index b33d18957ee..d70230512be 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
@@ -225,6 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
index 4acfe371801..a951d19848e 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
@@ -225,6 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
index d6c25869acb..b32b2273669 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
@@ -225,6 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
index 7a66874fe53..004429248ec 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
@@ -225,6 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0",
       "device": "sda",
       "firmware_version": 4.3,
+      "id": "disk0",
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json
index 766a1ac5c45..8bbd6a6c140 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json
index ee681b02d85..82bff698155 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json
index 05063e6fc08..3212b4ffab6 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json
index b4a5e346009..3c02b5c16e0 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json
index 6590096e7e7..79aec23b8a1 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json
index dea7cef3572..4f104ad289f 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json
index 00e14484570..dfb06efd340 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json
index 6c06cddd70f..73afe02e343 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json
index 782f1ae3795..6c31dfa0af6 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json
index 1ac539fe90f..9668d3eb28c 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json
index 6c17e49ee1b..b5773ae32b7 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json
index 642a0572ac0..88a516d6d42 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json
index 8954dfa95be..fc8de4c4fa2 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json
index bb7f58dbe9c..e3065790c53 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json
index d8538e74fd4..522786901c9 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json
index 6295188e9c4..803258b7c8a 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json
index 91f48f88721..93ee5c12d00 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json
index f383ed2e725..6e328ead9a4 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json
index fb002bc963e..0174f31f19d 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json
index 45dcaae432b..4a5fcac104f 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json
index f5ba5bdbd4e..f0a0a52b176 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json
index 15a0313b550..9228002450f 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json
index 80e9e7c5ac2..39840a708e7 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json
index 6b7b095a384..4a6c188ea4c 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json
index d88b2cddde0..d16c816744e 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json
index a56c36a5ab7..83c21284bf2 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json
index 6107c069d83..153e809811e 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json
index 5af2d71826c..f9bd3018047 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json
index 4ccb11091e6..dab814100b1 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json
index 4ebb6d5b1a8..ae5b7f9cf87 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json
index 065ddf82ead..eef30b4e8bb 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json
index 2d225960dc5..831da75851f 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json
index 33020864393..d9e5bc0c94f 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json
index f5594b5e3be..8f48a73d0df 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json
index 52977afebb1..de880031ede 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json
index 6db1cd6ed33..ad3cfc5f075 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json
index b89b94cda5b..8732257267b 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json
index 144024706e2..9e0d743e22d 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json
index be4c6dfbbb9..b4b33539ac6 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json
index 02a99a8a85c..1dcf38b4076 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json
index bb4656d84c6..6530a53e218 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json
index 071adb33a71..b0587ff3ed3 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json
index aa322e7caf6..0d6b86108a6 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json
index 215fd24318d..c46c1002379 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json
index 4213ff30187..bf0e0b7a63c 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json
index 05ae24061d4..a08d21a7203 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json
index 3d0eb7d7442..5e255036a9c 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json
index 4e5a268e582..191e28a5806 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json
index 322762bd84d..1c0dc5fd73c 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json
index 658e5c7aa10..28c46e0ea86 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json
index e23a192cea6..7165d238919 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json
index e15a1748b9a..e81077635f1 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json
index cad29821b0b..5356293b633 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json
index 964b9d3ca25..c053d2bca47 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json
index babe77da9a9..e4b4a774e4c 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json
index 4fd90db5fb4..0a07c17f8f0 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json
index 17c9aa7c4da..d24cecef8ce 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json
index c972325661e..bd69502cfc2 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json
index 1edd2a3c5f0..307926371ac 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json
index bc439fe329e..a92538ef34d 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json
index 1c75251de92..cb8ac5fde8d 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json
index 84636f80c17..84c486a8a2a 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json
index 0147bedfcf5..c973ae22493 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json
index acf33bcbb9e..d79dd7c3888 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json
@@ -173,6 +173,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.5-ata-3",
       "device": "sda",
       "firmware_version": "NB33",
+      "id": "disk0",
       "interface": "SATA",
       "model": "ST1000NX0443",
       "size": 1000204886016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
index e076ca33fe4..303ac5fa94d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
index 2c7825b1e3a..278e2fd4e30 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
index 5bfca6b540d..0ab93aa8988 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
index 5eb5208d343..b1f4eb49398 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
index 298de7f4e73..c6f6f741558 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
index 54cd4463388..280c2317107 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
index 05780b42712..9f61181cc12 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
@@ -189,6 +189,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
index bb37408b016..60122c6aefe 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
index ffe9eb1f3b3..af62fbd0fd9 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
index c31eed5f383..3b6880887c1 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
index 27c44c92881..87d94be56dd 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D06",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
index ca7498cd606..db3649acbca 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
index ab776e1b230..a2b83a7eaf3 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D06",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
index 2a191487ad7..c1b7b324229 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D06",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
index a10d549d663..e7c5bfd993c 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D06",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
index 456c688c67f..e7f73f14962 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
index 5d3a9d7b2c6..3ce86847bac 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
index 9a8e0836ac7..c213ef83b02 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
index a8b5f3218ae..80c0b189fbf 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
index 7d2a6477981..58b86cd8430 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
index 053c8cb3171..16e2b48f075 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
index fbca1c72c8e..bfeff9ed212 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
@@ -188,6 +188,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "01.01D05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
       "size": 2000398934016,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
index 60fc3cab762..616760995e2 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json
index 97397a3f642..eeb6885e272 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json
index 0ac5cbcaefc..ce20c777006 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json
index 4a0e5777bf1..66214877805 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json
index 9f7ef3e1f98..1dedef4b6c9 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json
index 47b2e2daaac..cff95e13555 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json
index f3f34edfb32..7a774ece95f 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json
index d1a5b114a29..3a9dced5152 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json
index 910314175b7..dd32a09ad82 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json
index a8f1c84d429..f82f098787b 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json
index 4f4cbbc7bd5..27382944953 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json
index d20ce4adb60..041af664434 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json
index 8c2884e6c88..9c2ce992fb8 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json
index b4c0b427ce2..e748a03888c 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json
index d3861d36012..e35972c11ed 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json
index d8388acfdb8..45f2ac102b2 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json
index f13219db531..1ab8179394b 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json
index 9408049f3fb..35636f22e70 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json
index b6257da3961..7bb975cb2e4 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json
index 4569981df02..c61e0520bf5 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json
index 69cd41d4573..b7537bb9452 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json
index 8df78f33f57..14858b2b80d 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json
index aee8fe199df..f6983d9d745 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json
index 8a5ffb56caa..8c5f2acde47 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json
index 7c98006e151..d04026cf630 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json
index e9650d02a08..a636323fb59 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json
index cb221e5f1ed..bb2453d76a8 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json
index fdfe45a951f..2c18edb9b3f 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json
index ac9b93f9ec3..8d5eeaee971 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json
index 642f202b8c0..4acf34679e2 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json
index eff0662fcba..7f65b49c240 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json
index 534bc32912c..882705517ea 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json
index c65d3dfd521..a47a55b5909 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json
index 2e5d14d7ad0..1ef597dd996 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json
index 9c47e0c852b..3021a65226a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json
index 77a0f77b527..8c5cf454d66 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json
index 5b68ab264a7..350c37f98ee 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json
index 19709a95ca9..c24c3fa9a92 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json
index 035cc519c01..4f8e1ccf2ff 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json
index 51aa0475768..4018fbe3b12 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json
index b5ff1ba9c86..84478321a36 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
index 9ddcf812b81..0553098806a 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json
index 0e59b6ff733..df828e282bc 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json
index fabeecab20e..9f0f56cb7a2 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json
index dfe105f3eab..d64a71439ec 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json
index 9708c95c91f..51773c1ba7f 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json
index 77a335dc0b9..d7587704f4b 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json
index d1f1efc7e59..4261fa0dd17 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json
@@ -228,6 +228,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
+      "id": "disk0",
       "interface": "SAS",
       "model": "PX04SMB040",
       "size": 400088457216,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
index 2c703f94e65..a17d48723bd 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
@@ -276,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0",
       "device": "sda",
       "firmware_version": "D1S6",
+      "id": "disk0",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -288,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
       "device": "sdb",
       "firmware_version": "D1S6",
+      "id": "disk1",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -301,6 +303,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
       "device": "sdc",
       "firmware_version": "D1S6",
+      "id": "disk2",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -314,6 +317,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
       "device": "sdd",
       "firmware_version": "D1S6",
+      "id": "disk3",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -327,6 +331,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
       "device": "sde",
       "firmware_version": "D1S6",
+      "id": "disk4",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
index 302c8dc5215..468fb149eae 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
@@ -276,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0",
       "device": "sda",
       "firmware_version": "D1S6",
+      "id": "disk0",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -288,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
       "device": "sdb",
       "firmware_version": "D1S6",
+      "id": "disk1",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -301,6 +303,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
       "device": "sdc",
       "firmware_version": "D1S6",
+      "id": "disk2",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -314,6 +317,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
       "device": "sdd",
       "firmware_version": "D1S6",
+      "id": "disk3",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -327,6 +331,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
       "device": "sde",
       "firmware_version": "D1S6",
+      "id": "disk4",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
index f4fda81ab11..d185c45af5d 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
@@ -276,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0",
       "device": "sda",
       "firmware_version": "D1P3",
+      "id": "disk0",
       "interface": "SAS",
       "model": "WD6002BKTG",
       "size": 600127266816,
@@ -288,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
       "device": "sdb",
       "firmware_version": "D1S6",
+      "id": "disk1",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -301,6 +303,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
       "device": "sdc",
       "firmware_version": "D1S6",
+      "id": "disk2",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -314,6 +317,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
       "device": "sdd",
       "firmware_version": "D1S6",
+      "id": "disk3",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -327,6 +331,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
       "device": "sde",
       "firmware_version": "D1S6",
+      "id": "disk4",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
index 5dff61032e2..a92c8398a62 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
@@ -276,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0",
       "device": "sda",
       "firmware_version": "D1S6",
+      "id": "disk0",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -288,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
       "device": "sdb",
       "firmware_version": "D1S6",
+      "id": "disk1",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -301,6 +303,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
       "device": "sdc",
       "firmware_version": "D1S6",
+      "id": "disk2",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -314,6 +317,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
       "device": "sdd",
       "firmware_version": "D1S6",
+      "id": "disk3",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -327,6 +331,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
       "device": "sde",
       "firmware_version": "D1P3",
+      "id": "disk4",
       "interface": "SAS",
       "model": "WD6002BKTG",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
index 046f3078230..5869f8f02a4 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
@@ -276,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0",
       "device": "sda",
       "firmware_version": "D1S6",
+      "id": "disk0",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -288,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
       "device": "sdb",
       "firmware_version": "D1S6",
+      "id": "disk1",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -301,6 +303,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
       "device": "sdc",
       "firmware_version": "D1S6",
+      "id": "disk2",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -314,6 +317,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
       "device": "sdd",
       "firmware_version": "D1S6",
+      "id": "disk3",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -327,6 +331,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
       "device": "sde",
       "firmware_version": "D1S6",
+      "id": "disk4",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
index 3fa7d6d87e4..d2c88a787ef 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
@@ -276,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0",
       "device": "sda",
       "firmware_version": "D1S6",
+      "id": "disk0",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -288,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
       "device": "sdb",
       "firmware_version": "D1S6",
+      "id": "disk1",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -301,6 +303,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
       "device": "sdc",
       "firmware_version": "D1S6",
+      "id": "disk2",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -314,6 +317,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
       "device": "sdd",
       "firmware_version": "D1S6",
+      "id": "disk3",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -327,6 +331,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
       "device": "sde",
       "firmware_version": "D1S6",
+      "id": "disk4",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
index cfaf4e6bd27..8a32f05e9e2 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
@@ -276,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0",
       "device": "sda",
       "firmware_version": "D1S6",
+      "id": "disk0",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -288,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
       "device": "sdb",
       "firmware_version": "D1S6",
+      "id": "disk1",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -301,6 +303,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
       "device": "sdc",
       "firmware_version": "D1S6",
+      "id": "disk2",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -314,6 +317,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
       "device": "sdd",
       "firmware_version": "D1S6",
+      "id": "disk3",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -327,6 +331,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
       "device": "sde",
       "firmware_version": "D1S6",
+      "id": "disk4",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
index e4111f7dc4b..3c155cdd247 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
@@ -276,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0",
       "device": "sda",
       "firmware_version": "D1S6",
+      "id": "disk0",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -288,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0",
       "device": "sdb",
       "firmware_version": "D1S6",
+      "id": "disk1",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -301,6 +303,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0",
       "device": "sdc",
       "firmware_version": "D1S6",
+      "id": "disk2",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -314,6 +317,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0",
       "device": "sdd",
       "firmware_version": "D1S6",
+      "id": "disk3",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
@@ -327,6 +331,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0",
       "device": "sde",
       "firmware_version": "D1S6",
+      "id": "disk4",
       "interface": "SAS",
       "model": "WD6001BKHG",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
index 54c69e1ad58..b2b703cf030 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
index 2d964111769..c2eb8904bc9 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
index 420e9c85aa5..2641fcc0db3 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
index 149629d5ec5..5c559d7749d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
index 7c6c243fbc0..0622d3952d7 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC4A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
index 96f4f2a9e86..5423d89b6e1 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
index d7e2949e818..9e76ca14753 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
index 8f10857041b..c5aada5ecce 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
index 8c2784d5b3e..ea33280052d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
index f6482a3b115..cb256467d2e 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC4A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
index 967fb5c2af8..18af8caf310 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC4A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
index 77ef5441f6f..2a7a0eabda9 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
index 7916f28207a..67dde4f034c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC4A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
index 4deef8c3976..d62d23ffd83 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
index e10658137da..37e1cbc190c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC4A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
index 4aa37cd7016..c6c0bec1371 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
index 5fc650277ab..25f2ba23b9e 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
@@ -199,6 +199,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "GK6OAC5A",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HITACHI HUA7250S",
       "size": 500107862016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
index 87d956141e2..1c58ee2c411 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
index ac225a7f84d..52bd3038691 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
index 036e89641fe..46c82e7caa3 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
index 03c7af3f2ff..9bb45730ca2 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
index b80e49db756..7937b703ee4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
index fb465d87bb6..7589e8160d0 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
index 613ea24a9ec..fccde07a0e2 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
index 6f70e4767f4..a2b172b0898 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
index 5922643004a..f0ac1498cea 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
index 3a9e932e9f4..0a12a051565 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
index 89ffaaa74c3..ce0fde86248 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
index 31666c8fdd1..9d3739ce789 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
index 1c9f74c40bb..331329cb5c8 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
index 106e65b28bb..c3a11efb80c 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
index 5d15bda8d41..3a42463a0f9 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
index 8cea034e7f5..b3c475ccb02 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
       "device": "sda",
       "firmware_version": "HPG0",
+      "id": "disk0",
       "interface": "SATA",
       "model": "VB0250EAVER",
       "size": 250059350016,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
index 40a85143e91..977542261d9 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
index da047cd7ece..97b1a66f47a 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
index 90eb62237e7..07b98b96991 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
index 23bf730305d..f7621ab38fd 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
index 22a522f318b..4a23f97893b 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "EF05",
+      "id": "disk4",
       "interface": "SAS",
       "model": "AL15SEB060NY",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
index 1e1c06a48cd..79a59243d2e 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
index f5d6e08ed34..32cf95bf067 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
index 95b25f4b604..6ebdef0bfea 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -243,6 +244,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -255,6 +257,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -267,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -279,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -291,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
index 1ad8e3f4e29..70180c27920 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
index 94ade0a0ab1..0273d22471b 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -243,6 +244,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -255,6 +257,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -267,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -279,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -291,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
index 61836e81a25..2b4210dfe6a 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
index deba177f2cd..f230f8c643a 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
index 3e747550a9b..0beec4a8044 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -243,6 +244,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -255,6 +257,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -267,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -279,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -291,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
index 6a3ec2c388a..39809b7f00d 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
index 4fc02458f8c..1a65532cfea 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
index f37c34fd5b2..33c665efe0b 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
index e4cc92760b4..fa0bd640b0b 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
index 610310cc69a..ec3b4762f88 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "VT33",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MP0005",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
index 2d91b59a14e..67d3cf8d713 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
index f9ba6d118ac..6c86dcb5d8e 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
index b2c1e9f791e..ebac35b67b8 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
index cfe72d21844..9baa852bf17 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
index d4ca7d63056..36087756f10 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
index 1877f638b09..793764c29d5 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
index 64fa2b057ea..b34c979b462 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "AM07",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX04SHB020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
index 3a5aaaf1e03..eb1a9c58891 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -261,6 +263,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -273,6 +276,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -285,6 +289,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -297,6 +302,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
index 67b9d095195..d0899446956 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -243,6 +244,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -255,6 +257,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -267,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -279,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -291,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
index 2e16e3555f5..5a8fe2f149c 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -243,6 +244,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -255,6 +257,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "LS0C",
+      "id": "disk2",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -267,6 +270,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "LS0C",
+      "id": "disk3",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -279,6 +283,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "LS0C",
+      "id": "disk4",
       "interface": "SAS",
       "model": "ST600MM0006",
       "reservation": true,
@@ -291,6 +296,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
+      "id": "disk5",
       "interface": "SAS",
       "model": "PX02SSF020",
       "reservation": true,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
index 99ad6a4f845..cecc7a384a0 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -243,6 +244,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json
index 89adb4396ea..a084d0729b9 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json
index 13115e3dcf4..16a9b457791 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json
index 8328e239a30..71653787e5c 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json
index 66e8994439c..e5848dbf0d7 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json
index 3721240ff3f..fddd9470207 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json
index 2981815b69b..53ac8d68bdd 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json
index 7256fa571ba..81ffea989df 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json
index 9caac5b77d8..e5bc64ed065 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json
index 5a807f7f53a..7227e075fe5 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json
index e4d9a8f9449..32a56504d99 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
index 5723a687f70..be7425d7743 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
@@ -232,6 +232,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -243,6 +244,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json
index d7bc7d53f2c..77ecbd16e95 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json
index 3a4f71a88d2..a16cd592bbc 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json
index 0b1b021afa6..21ab706397b 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json
index 76e2d940809..eb3eed55da2 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json
index e91e073b5cc..d366143a723 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json
index 5dcea1c98b4..77babdf5071 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json
index a034f1b674d..cf5ebb44576 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json
index ce601d6ae26..5d007afebca 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json
index 18bfec4c950..2910773fa32 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json
index b8468d1c88e..99e0275b0aa 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json
index 281c043ae09..14d81060ce2 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json
index 7e09a161415..b20c679c79a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json
index 712ea145aa8..2a3bec4689a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json
index 5d9570d9db0..899defff4c5 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json
index 05de8bd362a..4c736e55d33 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json
index 8a27c262053..3431ff08aac 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json
index 84970a8cedd..613aea78d8c 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json
index d14ecac3bd4..5a34d9c14f9 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json
index 5510935a1da..5526310ada0 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json
index 0be43110ceb..ff9dbd1b9a5 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json
index 1b13541534d..77803b42676 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
index af35acb71de..0b36ffa1905 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json
index 3bef0dfede4..e86c4f2f170 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json
index 33a1a810664..0252a75645b 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json
index 5f8a9ebee38..803d3ff31de 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json
index 14c5bab44e2..f7fa7862e11 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json
index db366eadc48..8835b1232d5 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json
index b6cd94e5d45..2ab88df3aba 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json
index fd0d0cf60ea..02d971bf686 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json
index 205e79dfe4f..d1a10073ce0 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json
index 24ec996acd4..420f4aec9f2 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json
index 5daa7260c77..4b15a8a7e83 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json
index 6ca2bfaa2a7..76219d348e4 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json
index 413de604033..8c77cdba3f4 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json
index f51cbd7208c..6587e1d3699 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json
index 3393084d4cd..ecc436f7bb0 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json
index 1af940ff4dc..423fc6aa269 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json
index ad7371a4db6..8658230ff17 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json
index f9475a7ce88..3da6b818836 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json
index c171b5680df..3f4a492c163 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json
index 50471a0d94f..2625d2e9631 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json
index e0ba2b8066a..840789efc67 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json
index 4261e995978..476a689d14c 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
index fb97042edfe..8a17ec730c5 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json
index 16ca068b833..c1f955beb66 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json
index 2f574b8d9ea..ce8bac3963e 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json
index 1556ab5e524..bae1fc9dc01 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json
index e0329b40098..f603ade1ed4 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json
index a3f043963cd..94029772429 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json
index 85657018855..4330283b919 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json
index f0ab928173f..59aecd0d517 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json
index daa4332c6ae..e5e2693bf08 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json
index b4aa483d9fd..1d76d24f9b5 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json
index eeb970d067d..aedfc1e42da 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json
index 00936268774..2dafc2e143a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json
index 0443ad4c9d1..b8e15dd232d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json
index 0a17346c016..3f17fb321cc 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json
index a7c5c79a48d..8b2bad38140 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json
index 52842c0af12..59ff9b15b5d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json
index 523e9a337dd..1cec1e244d4 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json
@@ -238,6 +238,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "LS0C",
+      "id": "disk0",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
@@ -249,6 +250,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "LS0C",
+      "id": "disk1",
       "interface": "SAS",
       "model": "ST600MM0006",
       "size": 600127266816,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json
index 97e6fcac785..078a45932e1 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
index 52e96c8fe3d..628edec1db9 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
index 70ad4b6ee2d..854f355dec5 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
index f6e5ef40f6c..d11c1d77665 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json
index f0fe3437ab9..8a3b4b2a79c 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json
index de8c75539b1..cd05beb812e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json
index 42f863004ed..a014771968a 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json
index 7f7e0b48492..79ff57f6082 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json
index 623e01733bc..f3125126045 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json
index 156a784b498..aa8b394f033 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json
index d6e235f8273..120fa26f0b3 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json
index d10dcbe16bc..8dab50e6d54 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json
index 0a24b9a7def..113ba742fd3 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json
index 686ac554d93..1fd55631625 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json
index f63f2d5e5d0..80aadf5269c 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json
index 5d642e17422..ffae88c2ff8 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json
index e9f60db7eb2..36f3c338b85 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json
index 7a4d6dd8a34..2a9c77fd043 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json
index 64a88b72ca0..361b75a6614 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json
index f7a88e4b1fb..b1af5fa9a50 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json
index 6d9d92abd58..e4613d261f8 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json
index 8706b8c9516..6cb5921bc23 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json
index edf1ae1cddb..a7331e1c891 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json
index a4574f1dbb0..b1be2b1de98 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json
index 154ab4522be..27fdff98c75 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json
index 8928a578c35..81ffd181e44 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json
index 0182b8be8ec..b4224a07001 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json
index b844c11e93e..7e5e39b4a53 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json
index dc4c0961a94..f3f5291ac5e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
index db916ad9551..04f12554156 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
index fcf60dfcaec..78b202961ae 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
@@ -191,6 +191,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "device": "sda",
       "firmware_version": "02.03B05",
+      "id": "disk0",
       "interface": "SATA",
       "model": "WDC WD2502ABYS-1",
       "size": 250000000000,
-- 
GitLab


From 7aa3800123fc6f4bb5c02a76939652fed834b919 Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Tue, 29 Jun 2021 14:40:01 +0200
Subject: [PATCH 3/3] [gen/wiki] show disk id for each disk and make disk0 the
 primary

Previously, the main disk was sda which is not true for neowise.
---
 lib/refrepo/gen/wiki/generators/site_hardware.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index 9719ce6333a..ae1c43d6d4a 100644
--- a/lib/refrepo/gen/wiki/generators/site_hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb
@@ -307,6 +307,7 @@ def get_hardware(sites)
             'device' => v['device'],
             'size' => v['size'],
             'tech' => v['storage'],
+            'id' => v['id'],
             'interface' => v['interface'],
             'vendor' => v['vendor'],
             'model' => v['alt_model_name'] || v['model'],
@@ -321,6 +322,7 @@ def get_hardware(sites)
           has_reservable_disks ||= e['reservation']
           [
             e['count'] > 1 ? "\n*" : '',
+            e['id'] + ',',
             G5K.get_size(e['size'],'metric'),
             e['tech'],
             e['interface'],
@@ -328,7 +330,7 @@ def get_hardware(sites)
             e['model'],
             '(dev: /dev/' + e['device'] + (e['reservation'] ? '*' : '')  + ', by-path: ' + (e['path'] || 'MISSING') + ')',
             e['reservation'] ? '[[Disk_reservation|(reservable)]]' : '',
-            e['device'] == 'sda' ? '(primary disk)' : ''
+            e['id'] == 'disk0' ? '(primary disk)' : ''
           ].join(' ')
         }.join('<br />')
 
-- 
GitLab