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 35b402845a31f62ee6779347446b92d5085d9fdb..9082e3a266d6870567afaf85dc86aaaee2041be1 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 7a6252a880ba054a71483df3c8edd21e2ea095fd..1db77b886b33b534d748c9bf354ec8f13e874be1 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 964e14577a3544d871a6b16f9827a009f08f673d..1b90955aea5202404018e51d084a81f8bf9a6ee1 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 02a3cd3aec962aff47a0d1c6188af04bfd8772a6..6fec495fff6624e97f402c22dcd2bef268764670 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 def3647b886f729353c85cd29e9167a58cbaebef..3ba05595ca74e4999b4012784b09de6c1bab1266 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 f807d347fe8ba367596d1799dd13a3cf5da05a1f..a8b48e10c4d068db77ef31fd1189b0215436dcfa 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 7d006de534647849c0be042d643f4acb69bcdc9f..fb99e8bdca653e763ebd885d45f2496a2e238724 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 445d9c51f01055706c7ac6a0da2e0683105656a9..fd7bcdf267d60c58b8a5ba0c3e9c8aa10ed3e5f2 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 a9fc1aa3529272ab74d7dff33751093d773c0f84..9308a260e556a28c510ffaa854b402402fc94e25 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 2f56c7944d05359527e16537ce2e242d2b4f28eb..95bd3a65602eecc7229d8a4e99e003cb8212a972 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 43b26f74ff8868207109c7829dfd2e2655f6face..9722b7e59eb0ee53f93df5ed8c146a50dc5651ec 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 b5fa8b481f72ac733e271892a44c7c5897332283..b507dfa67b620e09ea37556c49de2dca1d4fbcc0 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 60d0a305628b3984f3ec97b57c52efcdb3462809..4071f8d9dd236e5780319e4131fb1da32df0dc85 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 213f236e0a27bef26c637197e0a9f226a13079d4..bf4202a6e6dec514a5fbb95f1007e91ce73391e9 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 6bf2971b718a91d5b916230e3332281b6f1ce72b..7cfc255fec0098a1209838e4cccce8ea92be13d8 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 715c87e2f89cd39c002156a952f72680e2dd9d95..1c7a234994d159189db49a9c99e9d285a3150667 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 008cbc08efd8e15ab75b5ffc8ad86d4ea80e985e..7a43a9ccb44f30e2ad9c23ee2621d6a1291d3388 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 44016b967a3e1da2caaefb061e563def75b3b7af..ac06d673a00edcb5f66afc2469cb336d8f2bdc5f 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 75fe2a3b030fa9c8794d8554ef2f59eac5c3c8e0..7e7d56cd48237e4f952f8b00c8f8efcede83755d 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 6c831bd98d7a1dcda8c81d90c4f9dcabdd3f3354..e94ed92a2a4bf4c2e2fd719250e4c2c039a2e5d3 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 7aef70f10b83a81d414905acfb3228c3f26859c8..9b387ed9c45e8ef219656433c55aa6ee11c940e3 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 bef180f17cd9d71b604b43c2137efef8e4120fcb..c8fef3a2b6d1bdbdfdca490821921c4de4506281 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 a22cde8610c64def6f1b1f7603d9dee42e574996..77d361c7f4294be0226baea9fddc033a75f9444d 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 138174d456e58a10542d87eb6733c6d28fa52f16..f2f5d407a38204d3af5d73a0e4433a38a9243379 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 7329690e8a51b9df6ba9e928ef826aaca465869e..426faf5a0fb6b44bed9a42ac360424b18877b903 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 16fe1f2aed62dd27490329a0acb2521bb4611e44..8c109f2567c12719f9df597ab108968433d4386b 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 2160206d55c52cfd75a84120f48e34c65b9f9771..529e67c63eb12ea2e6b175491a5bfd2e392a1e20 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 2008cf631e32b01010f2bb9cd8baa471cf288248..39be1898a2a946ba339745b277b7b380fe623a0a 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 998aff39722c27ae0a9bb505c1ad4424ce5b8435..e7dbb36f1436a459d5a2cd63dbb8401ec738915d 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 b22663b4aa6c15b8eb9e2d08a1f2145338ea5722..418eb777276bf8976edc6a688ac3dd4042dc28aa 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 c6b69c67539751741b5fd78e79717b4444f40cc0..0dadd9fb97ce78379a4f1674d4a78fba4dec1f67 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 3bbc96395586e0cc916c4d2f5b68b4e58f97e8f3..2b9a23197b54503555110b142d2e3e89431cd3cc 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 29a52ad347b449b67bdbf0d5f9a10d4c376f2176..4417dd4bd7e264d8a37fa942bf92001e3f9fa1ec 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 c388e36263ea8fecc64b705d3ec836e18f12ad2d..b9d994aae54abbb6174f0c1c5a40687cfaf3d9dd 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 437f0c1ef218725be03cbaf30cf313670408db09..17b8f0eecdaee285db570e835d7b40340e6a295b 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 b7258ba042b4c6aebdaa9c480c5b3ffa3585832a..1cde08abd6a0c20cb680356000131123b5e2753c 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 a960f389a45abce9aefa26b366d3588a436871c3..38695c767fadaacd61f13493202e74f9b3ef18d8 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 c5016b7ae223d5aaee9eff2774648dc50748d0a6..f17a90f94b5762c4fb2607ef408101c42086c4f4 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 b3ef8284b21c60a3eb06b8d5f2ef73cf3c5bee59..6aa22937b392f3126784210661d23466ee8fa8ed 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 b32c87ea5c117451713ff5c9afbce1cf987c3a1b..ffdc346c3171c386a7ffa17f4660897d876c6dec 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 b5456d74b20d39325f2564d71bbb8baf1cd6ed45..8cb6fd7b30e30f5d78b95e45ea622baef3f2402d 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 f983f15f282f804d43560bda41dfa8c834d7b05b..ce23cd2f5387cfc37551dc5a91061e6e4cd08c66 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 76f18d365f79f6356a3a8ce2858583d120aea6d3..f84c2b30919acdd53d8c63fe59338106ce2d4615 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 0d336c51fabed104ab9cab572f75885fdd365bf0..d19b21cede1ccf70277b4a9464cbd6215332d67d 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 808cdf576e2c2ad380c8ee84223868e442f311fd..d084768fe6a44514db1bb7a8d6487decefa838c8 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 c5f28877c715601dcbaf193c1f216176a4bf2877..e92a8525b729981bc678c56044a26c8d601055a8 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 84cff05f043c7b0e0bee5d08004d5ae210f7bfc9..7f714bdfb17637f92778c6bfbb4c8e74d652d009 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 a7716b438f54d4c26add21574c704b7ae299bff4..a2aba694e2c7ef6b63705ce7594fbb7cbf368feb 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 6d56a9b12ea310ec6ca5c7efb6b8cfbcbe5f186a..abaa89d047d2f5672a453841a938b97b4bc088d4 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 beb85096d5fed9e4a5dd062186676cbfc99752a1..1e5706f3035837557facf4a49add875068de76d3 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 b93391a548b22789632edd7c8bfae7d87303799a..8edd6f3004d6a011182480aef3d7b3c788dce101 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 8754fbdd5e703bed8b35ce25f7a4201e2a130f7f..16602aefc799622aecb648bd51400d0c19d97842 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 0dd0cca2a87a42e0dc5189b23e2e771f462d8830..0e2a1266632608c0665bc165a5555b3d8f45ab6e 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 e52528269baf0815a809da44d25ef30ee7a4eba9..c11267bc676c396af9619b7882a57147c921fc6a 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 db22c6b7189f1a3a9b1dca818951d8f9b43a47be..8848f5b3a17d3dec7de9af31a47a41b597555fb1 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 7ea6b12b576304aaac6eca7321a81dc46256ee87..6ef734866655b98bd48acd2976fd1c2993e5e6e0 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 6b5a5dff84b67da9c304b00d721c5e98c560c47f..eb02154b9bff05a5485f9062bb2d1a73c19e1b08 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 771337402e63650a835a147cc5e044561356bc3d..c21b1a089431f5a51ef2c485bf63718b3bfd50e6 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 de12889141042983860e26770faeac3f214ab72e..061b8b0cd3640b6c27077df31c5c5d7322049b43 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 ef25fe4987dadb6e496250cc95aba934aa355f80..b8a4206bebf617c65e8d3b361cbe62704e5dcfaa 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 40f3c9f8d335920f56aa3e340ff84cbd47106e1f..fd8c73ed948549b0fe5573a34fa69fc5984a4106 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 075f9d3756992a63b4d42aee46c1f8ab46ebf5a9..33ba15239b04fe5213601c1a718164241205d9d3 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 5024672e6cdd585d172433e19fa0842b968ce9cf..012b5f3944e70853e7ea870cd5db55cd30320e8d 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 67283fb5e3ec4cc157ac8a76709ebbbd1b9e39c8..1c741b436c81db0cc4f38c7b5d07807ed6d16912 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 0e6b9d1e26a37a0bd2b605d6b1bdc31fc1544a5c..4f09e86ca0c71804b31a75d30685680770090d33 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 aafd47606bb6f3f8cc46536ecbf5ae39562ef780..44641f8c6efeb4d64d544071c6a34bc7c01a0dea 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 2335bd4781c1e5baecbdd05b894d0079e1901f36..b4e39e7d88704facd6dd416309fd417fa804aab7 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 54c9b75aa49900d030cc648e6d7f250d48c7be35..9a42a8ab4a6776dd3d2774f5a42de3a82292ddfa 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 29427dbb768f35b64be4e104105c9bb345daa2de..7ec8ad681f15c1db84e36785068a41328a34c288 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 b28420edc9950f7f7b2cd76d0dab6b794ccde14f..2a7e463463d78fe5578ec5398a73b4443cdd9d21 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 7922b2367d3ce6d5479799e48ea50d42712b671e..0058df9c0831781878aede1be6c22178fdcff546 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 321dd2f3061ff0aba9da3243faa1b9a987fcb37b..bad3fac3a751c354372c98cf52845c9a22928128 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 3aaa1524e4f55958ec802178fe98d5397f7d7141..90893262db2b6c74bdacb941f7e1f655bf56a642 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 1363f0ecd3d65a6400d112706595ef7a2f933ade..200424e88b362f7d3e38ab9613073a925b702d4d 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 7ad4220c1139589551d1a6b097de86a929ff8e52..fb40f01f3fddccdeb9e0070da7ae2017094a77fb 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 395d4a2d5855f8651d97f946113cbe0e83c683c9..4c934db8762e0e2ca185b2419782fee9d1a5ebcb 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 522fd358a9ad57068c1b4baf8fea28a1249f0feb..619e178798acf26e08ed8e4bf40667a2cb95ebb3 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 eea5a90d2921bdaa6445de131be991a752987a04..dbd135b415f9470d406bc5e9cbcc335f640ca67d 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 205483845680d89bb7eb080f5fe27102408904c2..c3ee65844c53aa36f49b211d9e2aab29c779e56f 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 a7978d49afff6c1aae85faeaf85b06903ee0de89..41f546d7334eea656fea30eaf9aef4678382bab2 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 54363251369c94ab05a39d5eefd9a0195bbc4f48..3bf3f281bf2947856cd64d7565b5f70ea9598e56 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 0d75ba72aac3e7be054860bf31f41ce799a17a14..a34239277ab4a0fbfbc6bf9ce60bd34f570e39fe 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 fe599608257da8f248c28cc7d4541e4411a95b0c..158d3c64d9cd938c76c11d140355fa9493e649f1 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 75c7e4fc86a1d88bfcabea616dc0793360a7b9fe..5271ba6c91e793da7af652d91c29381f83b1519c 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 fe4b13db0f8e2b272cbcaba6d9616440ea4d4bf5..59e0b67c0465e0b29bb1ebf0e0af88fa59c6a35c 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 9a8de4e18c983c5fb2ba67fa7973b7c4daa52c30..aad69f4d45f4be9d66d3f4b445dfba3cc0df4b30 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 3ebe5136080ae3e2d22b8f4b874f7156c941bd2e..b88e980a88c7dd8e71bf1a53634f5e31b3248672 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 d6ff5bc657fe2891e30206fd4d88ae889838227e..be2e123a021ebc2c75c2401edf74578f1e0c6589 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 c05769abbf3e5bf90a74c4a428565332daada19c..1ffc30fd0ca76dcbf107c4ae0e8892ff9d00a47b 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 a672eb117403ce59865114446f2a94d9be12ef6e..aca374cf05668d679ec7b66ef3cabdac1f414187 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 86884d56f28e3f625499ef19bae1d6412c3dc3e7..0eca09b7cc0c4cf9ef6786c583748e4e53b27aba 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 0e6cb7611c9f77cc334ca0fdc396cc493333fbf4..f11e7297c34de7ac15c0daedb7f1b4616114fbe0 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 e4e79c567b9bb02846ced1fc010756ebe9a9faa6..0cbadcc38540ba813f74eab280af4a9a0b932df9 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 56e598158452a93479770a2ead7b66ce38aba697..a014afcad7bee2a599b71fdfebe37b20bbd06d28 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 a40e9e61fe017c3b07810268a4b997cd5596c5eb..42ed1cb77c6e8762506f01ae91a1004b5f96d032 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 1956e6d4e8c65bc19a68e0c3065ed3690cd9e06b..f2ec967405d0f15b4a0423d4d23d780cc4c4f8b5 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 df6439d1e4a78aa7d4e40b2e9f2b3f4752bde3b5..5154db7ed3362278ec60edad0c782b1209baa759 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 5192610568a9c490d6cbcd4c3c0318ff6a344909..6ad8db94d26f68ab275c39ed2fb56c3f8b5dfab9 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 66205590b0f8c92018078b6375cc4f207bd30a6d..951497119d88a869e812e8653f0ee1e30c3d1274 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 1f349484e2c486c8910a93bfa143e94b99146b45..a8ad3950e20321caf0887e7d3194c32fabb3ddfe 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 0c0e94f7ddeeb840000c791659085e9c6f46566a..04231aa68c5b3a622bf026a77031ed57cb60275a 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 09c9607616f6a16007d23748c31f94924147165f..a5b7ed1d9a0e7e7548d9cf6c1a004dba83e2735d 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 fa6d2f046d0e3a265ed4383275be7147e67613a1..aeedd786bf39a3f6213564cc137f206c7bdf5ae5 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 cd6c85d01ad7cf9dced382884b4033f416cdbf67..1b9aa614fd62d2115764be0e5abe3d7fefcf11e7 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 3f8079b0d976c066592e6627c10570286a9a9e27..3ea9125603461a671a304510764216521ed5f779 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 1ce4011ce80f2dc94d3c90b91a8bfa957b46ec5d..7e3774bf21f2d6a71909fb96a2ae063474b07e4f 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 dabc39c22a20537bfe5abba2d2615c3c78915718..5b9d28e2a59a1443bf1cab674aa8455dc57d2fe6 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 0deb5b8dd9b2682d0708872e83cbe53a8d128f29..0396fce1c6ec56cc3e1bdf815e2a77adbf014531 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 046259a74b37ca439e078ddcb688d67de475ad00..a619534ed1b7c26c3a9cfa7e48b10971c84c7bdf 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 1692e25e73643f19f2eb713446807815ae2864f7..9634cf59e9e8d54b8fa641511bd10e1aefc700b6 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 764d9b43af994e97e470093e90b92978c387b1eb..e336a3fc243a352627ee78c5cc4a95cf72098da6 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 186aa43ed2c7321c6a6af05898cf80cb7366358e..ec5c79874eccbbc688e92ce7b989077db89cf696 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 3018cebb74b9ef71cdb365cdc66bac2af44397f0..535f5c011b253fc61a6187bde66e9f36a7bf6a6b 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 be852096411dd00bf18d70b0953cfe60555c4b61..cdb447ecc38a4dd536641fd5fb696f06e951c262 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 ff804d52eced4eabe48878e4a9bc48e817875640..d39f5d738d383663aeda79c75ad478a368e6b3be 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 81b1e65a0512a14d1e16ff99e3b4f633b53c4b7b..42896509c9a8900eba9c7a0a6d24b85a4af12516 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 7fc920b7793ffd1a41b7b59369ef91c172839835..fd8794b3801e89dbd9b96338def76235e6258f35 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 49a39e5d7aa003ac7587c12de92607cf857d411d..d97683edaba2aa8407259f70e20ab6d7eadaf595 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 6f7a74719d894f7c5d955e4ddfeafeb0e4ac31fd..7ddf9c693e2b93a642b674b000d1ca3aa6f46d63 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 5da0a396d929bc58934ed63ab61e646f67421f22..678af299b8bc7cf8019abd41c276a28aad5ae7f3 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 17ee613fdf748f888679122f7790700c8a89c0b3..323f12b84188c3f096e8c264fb15e164b0fca1c3 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 149133cbf1fae89a86d31dd1694773ec54c88247..eb859a6fb56dace7eff0a80cc033426f0c03a6a6 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 fdf4ef6db05dfcfef476cf10ec7aa797079ffe2c..31222ff6b06b176857342944a3f62f20d27ec711 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 bb751e49cf3f6d6b39ccea70bbe1d6c2c0ad2fd3..be5f7c6da3402c3d19f6ff7dfb785546077270bb 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 9e764774a8d63e6ded074063d13a0f84e0e574e1..08571aff8c255c45becbacb369e7c9f5de851649 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 bfaf3f78cf9cdc6ae56fbec22722b59956cdf806..7d054b792e2e6ced862d35962ca29978431ae252 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 63294535cc9e7e29919db9cf0f0be68940921f62..677901772eb8b64c806b38df4ffe2189beef6d24 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 b31626157f0ca5d5b88eca2d514229bc8046aa36..fa8cc4e2a1d096560eaf951679d8e65fd5666fd9 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 b83fe794afd694214a8760f0e646d592272641e9..5f9967b794236218f7787535f35c6bfedd579f92 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 0ac015a8cb7561e801774367668f2eb272d221ec..737299d1742c6c3b3884dbeb6b40df84e465db72 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 0b11df399e4e8871fcae9821f8dc4301ec810a08..e628267735f50ce8aeb7177b25f05b2cf8c31483 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 5e19b5f8d683e46a1d1bc72fad4742bd2d0f5af7..cacd62939b07ced9baab325651ec0824b2c3ba8a 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 244cf7d928fb8955dd1e359f45ecfa182eb7b450..abc3f40583adb7823cc50190e9fa23022c424fa3 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 a8fd8e075e00ba9aee4e080d92e5ed859259526c..58cc57b0d075c6a057cfb366d6ba45e1189e8a06 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 131a77507c5d671f68e3907cd0db5f01c1f2c560..333f3ae1ceaad7b2aab1cc3451b091fd7fa1ed12 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 589aabed176e6a7bcd7060144f7f64ff576c4db7..39ebeadd93de0f0b322eb0db300b7b6d8a75f850 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 84b90bb35b92c9675bd70a50ed70bfa552777a2e..815eaa971ad07821ac5e96176410294291a45a13 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 e438ddc890be3fe2a243d355d546f4a1469a04f7..06b482ad03c3e4aea716f4d10ee12cf3725f269f 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 75a7152ca14b135113e85afb511c52c516a900d3..6083e1591459d3dcdf58772481a24668c93cfd26 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 255441c85e6d98e663ac2ea98d66753caeae9e76..2442fa9c9f4faa803961982b7d649fea088a07b5 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 b2b432b5eb3aaec7e2c623791a83fe6b6a5dfc5e..1070d9119b580b0887b37ef987d92dcbdbf7df71 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 2fb4076969f494602ce3072cd629c2afc83f153c..0abb6ef3a2969c77f987a9074ed56f761e124043 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 68fc94963b424e542f783d760c9cba315a40d2b9..b463760362ab5377a22b7bcf8d0d3924520b707f 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 36f551c5d2fcf62aa3b2ef9bd141219b532392b3..718c5e02f50f0cc1e4fe9fc270b335065932a3d3 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 dd67c9e9f04e344465cda230551ca36e47917836..b3f7e8ad8148b4c705819c2203c5832636c21a5a 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 9bf5a847ea0936eabdb2d0c5fa944bec2d95441f..0b5ea11e8bcbcc1985016785f754f7f381800e18 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 046c7b5713fe1116ae7fef4ebf7c4a8df6a093b1..fd20a815a1ef61f777b251882f9d5e7e05e25a99 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 a8dbb8529c7322c819f9223cd46865d723fd5906..bccf98d504f5d3772a70428e6f4678cc1d3868bc 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 a593bbccea55795aae219e4a22fbf815fc71179a..690e5d4e0c05e320710d50db815ecf26908928b3 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 7d9c647efb066ae95e57d7689041f2bd67d92aa6..cfaec073007c3e53d7ae8bdf5323a23ae16b5d3d 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 4896dbe3e726eb36027662253a610384615aa5d3..4babe97fbde58af8b62a6cbb3e1ada9e6fc9f77d 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 4c878e11085f8bf199c9252c907249d5345d57b6..7ec9dea1bc58abca61b57c364f9a47f1a0182cd4 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 b713a31d18eef5e2cbe567332829289912660fa3..608dd6e32ce3420e54b969bb9fc4f6d1302aae8d 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 70a4081cebf8b14437e9adb51d92d85a30db49d2..7b6e6a8c95b473b26f42b7a4e51eaffe0fdc1c43 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 ed9bcec9802d88286e3036224f6efe424596aadc..72752c2c148743d7de53cd5ebaa2c1a13872b8dd 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 bc1badc82e4929c323fb792a0af09a6d63f9d0e1..83591307f003770a7c616979d4b09a35ffcd6aac 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 4ee7e0aad89d359076d0e35a284dca46e4a2ac16..ab752ee4dd43b6c80aafd9d290444f775e6e7471 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 169317bf30c49230ff3512b9a99b078b009baa5f..e8f92f2cdf9d9bf14e271bd4c07008580309be63 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 fe83034787f4b6840fdbccdbc511159d358c6d83..5d4a9927f3a3f5ccbcdecdab2baaf2d78d0b980c 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 a613c2866034f884ccce7d50d3f6f5bf11a3a7e6..e2da22078a2af4866f5af179383a476553b2be2f 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 b127b97551786069b347eb1000d4d2fa34a4ff43..cb8c76ce29c134051994f7ba60edb4b1e6c92bc6 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 531fdac72ed2b7557173a3f1a9a63b25283f0fed..3b13bf162b7937c0ad869e2a096d940334bf0323 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 72bc831b1cbb75f93f96ce649cb08610f50f53b8..c28089d52100c729e1168e997f207fd37b43c854 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 370c84a1efc7b5af6a16801a29a44ed72d796928..51877ac486b4efe71333eee49eb4d21181a18efa 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 d273e8177ecf3324c01773f45486661ebd1cf349..7ffe4d9eb77bd0dd90c1085e0595660be72791a5 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 77bb02ea120ce91aa231734711e39aec1d9571c6..ed7e35f9565b7ad1925ca8ed0787583399293482 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 0f7322a0f2c7d2b42525d259e0f533e716380359..b33f35a09b5a2c331e2d75b20ff5d443da61ee9b 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 d805abed2334134f80d77622d2865da2a0483704..d6500c0242e6e2c95eb8690ca931dcb64adbfe16 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 a8ec07c64311540e1e4fed7e5a0b1ec0358fd703..ec35fe0963218021a932f33d6876d5963b858462 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 e2e2e222dc3a9fb986b288c9cb989e0bd11ae051..a0b8a42fd7b0013563f90d276530c981a20149ee 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 1a7caaff272d23ea9770ea058d36e72bf08cac67..9e6e3a782b928f5a99cf261c538957e6b43384cd 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 a73b661d22dc660bdfcec9cdfd30b5489958fa8b..01f841078d73d18ed891322143c1d901c666e528 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 e18ce1ea9566b426f72b5d9d965a625186431cae..a08c1604599787ca5e8ead6984671302e8cb2686 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 71c0dab73e9ca4182658f93e4b97ee48d289ad96..48444b78e48637cdf9df02b404aa5a0b2e752289 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 8ae0e3d5a0d8e734b4886eafb7a4b4bb5d0263dd..713926b2eb81d0c5e0fe97cfc2fd58f2c125af7f 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 c65087be076e403044b4342fddce36a486731da4..f1fd16c3863f1d757ec91bd4dbd27713c594f7c4 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 b20c187a740e0299a490dcf2b5405c138c5f2282..e97fb52917c9f2960b18db99a5d5b73eac8a32a3 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 5e6d9d5d13b5adf76187dc034aba2e0a927a1f5d..4ae0f4b49f499bebcc9594e2ea4d3ea0a2837e63 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 d60cff2b3ee5fbb6a9b2cb8ddc5caa397ae0b0f5..d5093d384f82c6ddeeb18038849a297c2ab8f83c 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 b31ef3455ddb92a5c821480ef78e0b15311065dc..dfdb5664bf15a1e7b9ea89f08eebb7fccdece608 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 10bea93d0395f65ebb9ff689cf55f3dc31a2f3b3..14e15b4e5c02d991e0d766859f1493954df2413d 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 253c4df679e94ffecfb199b7d17a95d29c360a90..9ff3a493ea4f6a315b89b0e0f6dba1ba14ae4b49 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 861cef5ea3d4b34dcd2a40eabb6bca78956ea284..9cc95778d4b4d4529fe9145cae6b3b41310c3522 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 89db44ff91fa9978e57c214fd58aca4153e56eba..325607f115191107a50f007371aba623ef10a9cc 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 f44f81c9aa25e0b36cf906ec31a9243bdbdb642c..46b16295d1b0b76bcdec874da264e5b79ae6dd04 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 fa856d3db33302a7d41108535dcc2ba524f09ddf..0140c28fa2ba23b33e08e8d2672a3050176266c3 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 66d25d111898f0ac6703e749b6665ecdcb97547f..aede8ea1826b77116d82413cfe39bfb1c66750c7 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 44c0cffd7088739eccfa536a10b049aae8c0864f..1f62b58537f8983bbc4a3cd33caea92d8af5889c 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 c559214753f70e19db403977b33472647ff7cd8e..bdde24a46484f59af697ffdf18e8f4d6a11b19c9 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 08ab2f1254dc2c801ff0fd13155c423588571d72..aaf6520776eb7aafca33a1ff098f95e3ca416d57 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 ad2af08d0e04f891cb5eec6c625b0a5c8fedb0e5..281e797b90ee7e2f195c77e46c8a13e32664f4cc 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 f1cc2c6f8104ce91849de1683c65d80a08d1b936..7736b8327f4078d6be63e92a01708ee223f88ad0 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 4e00407fb3fc398a923add2eceed4e8d92a47989..78920e50314c6289e1c7b9897c3cdf54ab61657c 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 d696f2a10fa425007f7999014e5116663c66d9da..e7c1ab49a74c96ff3a3a34bd6be11da4a5bf6791 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 f4d20be52ac72dd9435f63e19cddc24c56594373..c34ef11de5b2f91e28261dd685dda9aa3d4a69ef 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 e9412d910a22e10b809477ba90d93c6618d9dd20..8e01ac223f538ccf2d7a1e5d53c49c170c36ff57 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 2ec9fcc29a18d934c0352496fb035c559063ad00..5c122c9a4b137b1b9662f88c08572b336c60a137 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 0a6f9c7fa23b8d78823462ac12741a7c33e3d7e2..510ee7068cd93e333716d829043969f291aba9f1 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 492fcf5dc548298b355d535ec7419603526966c1..b7ecdf4f746a595af1dbceb32acbdeebcbfe3b5e 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 59836b659c612f2f822b0c29fd549bbebcc18821..44ceb23027008e7ac76b02b21fafd0929169fa25 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 de10ffb9f83ecd9052d072cb88dad210a233339c..381202a17c1f53001b71056285cab98df6ec181c 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 17a46bc0da4b3f5973523d9ec3a3ead02c1696c4..50d7eebc5e435b2e63c4ee90a9a4335af57aca9f 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 bc18e57154d595a240a0a279586f206fff78ee0b..764bc282701e8e72cd0d11ce21f5ea5091ea5483 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 308afd2473683003eae46bb30490859fed713918..edd8774810c20e2d171fdc3d33fa32f7238b49b6 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 0cdf951e17459e443e20277949e6e4803de49e56..d42035520858fbe32587fba9e5edfc612180e6cc 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 b6d51fa035548d6aed08932a023828b917412f71..1a108c0af5b21a45bacc937e0958aa207ee95914 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 a039b079322324e0fdd562b52be7f014556e59f4..31300dc48630b7f43f842ed376093c1c5c2f5d36 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 8f3c2423ab42498fa9c9c039bd379c73bc7bca17..a590a3e6f69bb668d15d6251e505edcc769e8025 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 32c9546bc80ecfec894094bb75917ea3cd7482e7..cd17d326fb7e91bd3cf37ae0cb01274d5da3249a 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 e0a896e3a4bea2eba59c38d06c7c999f06382587..734b48b14fb390b7090862d0315bee9c0a0eb289 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 868321cfff317419747f86506942b8f90cb173fe..15c8b5588f82cdc20fadff46fad03b943e39b58c 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 3b236a6d28dabaed3060794b779b586655c79097..5b56bf15d27a7140ee7eeb559de936cbf58e642c 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 1c88b5d7bd2a07f4984b97e7be34c5bff81eb844..1a71087d0a44e0497c97277e2e202c0539829c28 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 9bd795e512e9741222681db8834c67674e2300b1..5e7dbc4984da01d3210e0fb6d0114ac867fb4228 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 71a7da290a5dd17797eaf405e710d86cc04c6018..c50170aead23ca580982146c34310ef697c46a6f 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 6de1b66dc7caa35e7a9a160a11172154f41bdc05..b4bca84b945fb6b80683020d8140fbb03f978b82 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 a4952b8f05b132a897dc05560f71891109056dc5..b9c524479d6011b91e464d2328e4fba729a5a796 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 af5008abc57767367c8970edebda56c9d609e6bc..6fdbb44a1298b8394778642245733479f473e5f2 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 a16762e924cb6b9743ffd46ea0c7501370e74b00..1c9fa8eb308cfd1f620b229979ab2d2235660bcf 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 873bea1174425a9485a0d563d293a046e52fa139..a034aa0b2ffb55e73bae6881da428207856416fd 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 f68b2817219f64ddc043250007291ec663ee9dbe..362f9d613507683d5d683e7115e66ceb8c7eefce 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 3c6eebfed864f88bcbecbac7d019bf3aa4d151ca..f783cec1b381d031c75367b72e306ddc8bb5b40d 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 6fc202ac5a7411e4786c094f172c87a854625328..6bc0d13db93fdf3c52e44ee107920b85ebcf9e2a 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 a255b7586da413cef8dbe4aaeaac476b988af83e..4f7c0b7952824fa7eb8bbdf6b1fb16962ee4089d 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 29ccef089053c2b5d5f37c3705837c2712969769..9f705ecfc9f48a5a8b6149052bead20fb1a63eef 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 3450ad2a67eb1f0afed893a9f7ae807185e2b923..0fa8d19ee1b26e2afd0485113175dbbed8a4f121 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 969abbd03eb71f0a82c4aa64722496c9e4148ec9..732c5effaa0e8d3887417c02990c2bae8aa3171c 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 ed104ff1d37a92ffa8f98770674e2bfb9f7ba09b..c28b8aedb2d134182229fd3e93ae950f328cdeb1 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 c29173472a569450198ec48198cf9ebb9bac3200..056e0391d815a2778449baacf586aeb9cdced07e 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 003d83a4133c40d503dbf4cb00c2a43073714103..60ca9660ab2709b31250bc612e58a1a9e1f53cf3 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 466e2e5456e583a4405a9a1959fbe9be207a60aa..94a082bc41c4f4f0bcd77dec89e55ed13fb1c28b 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 5abc5091f815d9d857ae5625d447c297edeed9f5..9b2b6d247508c6855e022e9c0ffd9e3c6194d62f 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 e35ef72441fdc627be4a500d84ebc648ec3d0626..83638f83402e86d6f73e6abab231fabd711f8c25 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 2cc6ccb06fd996520ceb7d524d9581940dd1266a..abff90351ae9b38a02330110c094894e5886adc8 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 d1e4b16954973edd6bd67502c6f87a4c626a9c58..baddf9e37b8aac96351870f7d5962cd9f8585694 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 3a60c1fa815f74d12e1d28f07106690937f7e9fa..481bbbe0e0dbe73d95545b5455de641d9dd536f5 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 b0f8f4917b6531bbdbdc239e19a7623ae93c905c..4f58d9286e1105332736693670f33e04e7af70b7 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 0f1692592ef1dd06ed61d92c0afe1cac4059aa41..bcaa223c1ba0bc944f825ca0622247f58454300f 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 60cbb4b8d9985c93500b6eb3f4e3865c079c634c..b3b1e790d290be67f88e267d7de6c91965fd1040 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 e151ef0669a1c3b7423d07f8a0e7b9e333a0ff4b..b8a224f67e883701ed7245b4b75e3bb2921838e1 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 69e7e516655e4da7cdae9607cc5f4c706f8aeda8..17f8c85344f229170327e0db5e1c1ab7ce758c61 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 ac722886cbd2f7908eeceff03542402c15b46a0e..6ae1ee0b79bbf70013f47ce6858705b9e3f4a2a7 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 efab59eaf316b94ae6dac8d8fe05afcd8eede00e..76a7b8ac8371a71d4f94499936e55019abc14c13 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 3abceda92c08846c7f220f3d8de15782c2eac7a7..28f277fa8d2a1c024a147781dc43af77fe5c7d86 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 1fa79e861c2df9a256b57958e7d4f5fdcba69f9e..183b85589f0016c351b9c0f0fb0155aae64b675a 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 7ff033b05fb31b05d252464d6b4e2663fb75cc3d..c4fd1feff0130b7b1126690a00040323ed328c9c 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 81333550296efb130d27d319967fb71f185c05a8..f74e3d0dab26be1a2d6efa700b8aa6be5f035af8 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 fd9eb8a3177f27f1ab42a3f408ef4076a7e04347..e0f611106a854aa6042e6f5d964e98e90a8605eb 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 04aa76853f6f257cc68a3790e0fad4291005d549..941e88ccdf18e17247991da74a1c4bfbb242646c 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 7d0ba56cd3945fa4f7e0b0834d33e679bf14d77c..4d4e063047185aea3e4df3fc9650273cb9ada113 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 11cd62702524572d03ec9bb47463ba34e43e20fc..5422f049704ec30cb816a6ab6ed571be423b5287 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 16d4f97f213db0529313e0ede806c41ada70910b..9d95ad439744a14c5662304d2a51ce72cdacc3bc 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 c3965f5e56cff0c7f32e2e28a60acbec7ec3884b..1f96d59b8068dbea8add1b1e0994351ee5333a0a 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 17aa08f659d7829c4d8650d247842958f2877d7c..ca94387fa73be05e8dd4f1524bf516480257f609 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 734a043ff0122ee4d0262d031442313a1b0ee4b1..004bbd56475f872663d8fabb9a40ac09e899d703 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 b61bdc57b48e90dbf518f6c8da20060ac52ecfa3..6feccb358bf37479d4659fea6febdcfde2bef9a9 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 3f5b132d0dc393430539c60473ac0ff982e4385d..d529fda2b15d28b672ae9978fe8b5627351893c6 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 5d259cbb327fab462277c49b5b7c5608e399e4db..8359f775ecfabb5ae1efea89d9a5e114efbd49ff 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 5476b7490efdb303fc0a9839b34bf0189979b25d..c900bf32ce97570c3deff66a64ec8d5ae3d6540a 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 a702389729e680faf476b4e8598888de19f9019b..732ae33c699bcbeccf4eb3429d84abf2b9f1f947 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 2e678805df281fcfa974fc7bdbcca326fc714734..2bda575f3c0402004e4fdbab765e3ad032c1d08e 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 7c671cb4200e1f46ea874d7accb77178d8b2088e..82b403199484a6404f3d3c43f6fe6f4de07f54a7 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 0ec528d38b61bf714edf254c72d3b0c2bec9a3fa..e6bcea44bb376a037cad76f1199ad5df4b2d5b36 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 20156db903d16d15c3cf76810f1102c95b375c77..cffe57b878b6a0cdbe403b3af150531c23028867 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 ea1663cea4448382818152755ad71f21ef1c4f06..1b093d3e06cc2ed0afa3d94f16fd1f6ca61fc110 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 7a43423547da9c852a6be7efec9a918da0865b07..e67c668eb324b91f8ba7391b76e8fe504316f499 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 9694960e16f9863eef73b4d1c00173a084e90054..2a90b058834aeed6963d5dbb1f2de6e486be7dc4 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 7a2c2d4631048a735ea8e75ff537c38f245ec80c..1836c98dcc2d4fbf1ee879db95935e62ffb4ae39 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 dfd46e15a52f634dfc57d98c3f1a6f9aa6242afe..11f6959b683c5f7d4e6e56c032ec81e00df5cb96 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 65c33d7efdb3b071a2f742396ecc396825fae3d6..b8df124e3a6ecd3569174fb2090001bac4c32969 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 b6a52f6b6c8b3afb8b3a9198088eb97a289d1729..781dd4b9e5f69d99785111af7bb0f2bd1dde93b6 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 b322800cf24bde6aa02509f73e82526b596a8543..ae72433c86bf7e4cfc57a539707cd86f0c577cbe 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 6383bbbfd4f0248b1a7713822b5c476d91326d78..df6b6901de723dc1f21268af25867a1af6bb8916 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 e676826c9d19d4bef23e2ec3d8b89cf89188cb21..4430a1edcf0f285953fc6da3d2e9c4daf1628c4e 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 477c7ec8697243d158ba960eefae5b271acd0391..2187d2e380a59b5a0ca77526cbdd72fb77016837 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 32a1863ac4f07a229d053272ec0b4c639eb13e8d..89cf1e9bad63117aa0c67e6fb7a0c88ac50151e9 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 353a415978a3647464e3d8329fc84ec4913d9a82..ae4d8a39a5126a9279fb479aea0a65d036ed78a8 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 1016fbce4b02d86d771d6a1e54563a2eff379378..a96430ec3c481e6a2695d43ce411fa85112b95d2 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 13708f229b84f74d501788d773aa8e4632b2b559..d4dc253d58120d3891b14ba878ab61744b332fc8 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 6d0c5d3bb212cb3cf67ddba26a02e95daecad07a..8bedb27be084f1700805e1f22b594acc9f09cda9 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 31f46948b453b9bf548e4a227ec752e96ba94343..92e51df535d1f50eef4a2ab759ecccd9edde5651 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 46fc5589f31e5d5ea43bdef398664d255b12a954..967fc23eb317910c50bf9d148ca95f6d1d2d9804 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 5d862b1edb10f5d877cd0c47eededec3064182ff..8142e32a368ac40af6533cc21f6e707f2f472b3c 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 89f82e2eff1fecf2543658da32c082e212454244..4ce1ee19bf3a39f3736331e55840a4f7ff314528 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 7b3fdcd9082d1c19bea98b519ffce1692fb089a2..7470ff4d6a772ec692ed87ef54c6e3eb7f5ae8a5 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 b8efe240d74dfac3c6e9798fb9ec4cfa4e2ef596..b527f50cb19167653798c7c595137b5244465886 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 eb24d13c4644a7ac4f342cd1952cf4da36c57716..98a38d1f2e9aadfbe5034ea4e71b66bd620d2b25 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 1ca56465843c633599f3cf5a10b51d9dcdc3d228..bcead6fe760a7b688874533a2f4e83a73c956ad6 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 809318fe78ae35e1d9025f340bbd95e4afbcd9ec..b5cee8037451708b53b5c5cf6ec37383e35426b8 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 d0c7b062c6ad1ad8866398375dff12567408379a..1b67d359a8a15e44b7659039d3c599fb0a4eb1da 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 51ea2ffaa17cdff89c0c4c6b2d0fa5b3b8f05067..543bdf8f03e398292e236c12f04bcd8fe1f4c5ac 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 8c8a4abe9a59451d1797230fd61d885809484a4d..91b0818d295b50caada8aab16246f1dac2a47776 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 8172c6f371cfdf9d98c342ffbe7256b033b9cd20..1a7a2abc1e770b5a737d8605b922cee9f91189d3 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 92af910250ccec8be86006be30faf2df012a8dc9..33011efb758bf2520fe66f37961e61243b2a6048 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 11775a37d0fc7ab1ff5905fabbca0fa909138c9c..1fe9b9543efb5b837a491b2720db04bb231237f9 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 3dc0e9168e794ab605c3dd52c53a614a17e36563..12eece8f8ed89c25a873ba54fdf4b91fa3ae4674 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 bbc3a6b65267a2b68248aae07e9e0aa0968ed5a3..a41d2a23eed56cb196a858d35bf28589923b7cc5 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 29299481394b779a57b8b2115e0b2b4a75398f33..69fd42e25fdb0597b33dd1e23a1311ecb1716fd5 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 12b9d7d84716cf6b7cf1733d3c1e8c6044af8483..9890aae6da5791909d7affa456b64c281d9687bc 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 2b6fb41c8fce8d14067398d848ae263ccd3ec974..b52a457d7e4c5d8a96373d644be4f67cb0ba9761 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 e7202fed3ff20b12705223bddc0739f9709ce9bb..a810798ea04edfcaa9ece0dbb32d1f06d541b0d7 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 f2a68ea03b07cf8ab2fd1baf7485098cd28503f5..52089e1cf993286bef6bd7a94f63f48bfb8fae1e 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 76f17f69bd7ae6e86365d89c63403d755ec5aa3f..63593bfb03e2e63c0549978a1d08f672d704486d 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 4744fe0a228fe888d280dc22f18ab2d8f0c56511..6dd687065c79aa38b9fb344993fd6dc8dfeadf27 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 f0fd5dc095cbf6c30f0b54985bf63e152eee3b5d..ca5b0a138a5dd2175331b496115fb2ff66077a88 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 592d7be15487a03077b367bb19a844583c115545..b3f8e82e51cf2f4572ef47896003f76e5dc78c21 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 1cc73faf6042cf0cef096669c92b97af3d9e6b0f..b4f5ba2e9be92ebcabf5780140d1f195e9b73953 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 dd279e208962b9552b4f52a0263aa72178dd8514..d9797378641fe3e95897fd439135b03897776f26 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 462cc4b6dbfa8ae2b530dff25599aaf2b4f4146b..fe0d2fed2a070fc830051e4026f680731d6a70f2 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 58fce14a1ff4bef7e168affb588baca195c80a79..a67ad0e746f1ea7a3817b908fd1b0ac8371eafdf 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 878b859851a203522b4368672356918c3d3d0dfc..03faef29a946524131b86643c303357f5403af98 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 84028ef0e180b0c4755794f0a52c0ac09fffd2d0..90b811be25200f9260d9dae6358ea9d97705fc08 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 cd00c10ecf1af6fd65591000ed029290cf6e42b4..d03cc04bd121773e76248d28e097a0a1be8fa5f0 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 f2efcd18fe7176f63cc20bf141081b32d72630ba..a2b14d82183b1b56779bba66cdbd7d5e0952f268 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 ea13d177906fce38b5f9a6ad89fd41ceeaf16970..d0fe2436d9b661b5fabe9c8a85c8c0ea1a824bba 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 21d145bb1c0bca3cfdc06ca8e1a5635e3b17d343..45a6c518029e542dbace7c637bd37bb43eb0d055 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 c73db22798ef035f383275d79d08fe4b2783642d..d91e6cc3210e919e41badb7ac3459d945cbec5ad 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 95d200e249ebe3f13989706446a9c076172f8d67..ae7e22290469c359b67fe1b48209b5e36e4e33d6 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 08fd4fe0e5cec8516c308646a7f6269539c3f3e7..af7a7b05e96c8877c5a040fa76caf2e88bf757c3 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 995dc3ff92675b91313a395c17de12cd5d3c9286..62ca8104249698d5b74a91274c9034d78fdef340 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 7b50f9a682b1632670af3693846f04abfa193793..f8b5aa8b9b682beb179d6954c49804f21bd74337 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 c9ff7220a453f6da134eb085f011c206365d3511..8ad24e8ad7b5ec3645300e91ad3cec26f26892f5 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 823412d5d0416110ac174a9f1a13878740091dc3..69e19791ece9b480e897fb2d00bd0d34513251f2 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 7b7088ed03138e3593911fba11febc5365af5c16..ecc8b0411fffe7d40460d602eb17fda0840c5e2d 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 8d6f56a3eecd4acc2b12b1d12c8a777b98a8e4d7..627695ce43a0f356cd933bcd4fa3a6d4a2fec524 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 6c99f622e4dd1de0e664a48dd5b8bd6100f5bf55..6c51fdad0db6df7f4a25b62d8bbd2866cd1d75d3 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 4ebd0cc61e021f4e5a00200bf8c06cff98279f49..45fada9ba689664c7f45339d154645423dc54744 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 c3e3371d97b1f1db77894576cc0f56bf2a60edb6..642b18a10c8553ee0e1810988e6b6915bcf18cdb 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 26587a428dbba8bece5de1a69d45418fa050a423..c4c53002e4144d608fd51345f67a33dbbb6c7639 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 02bfa9253fb62c1a414b842ed4026381cc5a3020..a50eb89fef7ce5f1c733c364bb8de3ae12cce889 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 1ff78676bee87b1075ea5f5565d3593305d1e6e8..e5d93a049dc23dd845d68743fd3218d16c2abdc2 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 27b62da3ba0723d09787906959b519ab4c23b334..63c2fb534aae30efdeb9d5c36ddba8b27c4b904b 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 6dda60d21f23646baa6fde5bc3e5448b8ac2ec86..1ee61a146217ba48ee9186c61c91bea9cda6ce0a 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 c8fb2305bcc8f091edcf6c7d1f8c0c14abd1479f..89928075aa43f13572b2038a6416114c4826317f 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 eec787c6cf026fba92534b0eed023d895dc6bcc1..257e5a5aadea1254c92d61956a7d9ab0f0244ece 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 639ad9b30edceb54444255fc94cd263e6aedcd88..03c8acb05b8552c2e901692335cd538032b4bbcb 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 077c7a8d9ca9c4574765b33f442c700433ef38cf..6996c00f0f002c46a06c951592a06b091c9f337c 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 7857e566592aff0d634170b3defa7a539f0d05e3..228daa083bd66d5ea8393566e636fa9b9ad7c993 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 44fbdb93fbed36e51a91d800695d6ab1807c7e4b..1dc6387c0931346f6409333be7ad8c8dd28a739d 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 0a4708cb59655702ea82d210aa08994f7668ca0c..dc35c13f15c65b8a7a759a72b30080f13b50c81e 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 ccfa47c8df6b4957a748d4522c749978ce65a189..70321827af13eeec1399c53cd928601e29f65939 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 ab8e3bdefe2bd7ac8de04a383a4ac059e81d3c86..e22934ce01af6e544f02f7863c9ba91e28665f52 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 dfc1f5d37f6f1330ed88c18b01dfc249f549e27e..1b263b0cf190e66d925d791fce466edd7c02f318 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 94baaf3cb72fe3b1483231f767bd0e2e37a995be..d4d1115959ff651f7c29cc584a0e5f4e906ca59c 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 5db0e464d516ee237e9170ba45c5b5c2b96ab179..79d0404890c1e27950740b477646e07427c42be7 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 a6d071d3aaaff0da6f87638d6d44816aafcb0c3c..90b5cdf2b79f5fd7e0c07c1b35e080d79e8577a6 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 fd83755355737dbeb3c07a24c3973693316d79c2..50be2a5e914b0c7f6eb80241d487cea34c76c1b2 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 6bdf824a5f0b847c348bad75cd3e9725345421d0..3e689b3311ee4b887edc18efae96e28d8422dab8 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 5863a2edd062be10ceaa3dc70ced43f07c9b164f..f3b8b18c45833a650e1279b057889300c6e1e7d8 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 7b02f8ef103adc163c588e15052bea0732d6ccc6..3d92d8213aad3b6bc14092be0e6a3f80022c9b87 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 f03249f7d988ff325cf0a986cc917a2f16d5b361..22f6c480439984061298aecc76bfb8500998827a 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 28b48952cc2a8847dcd1f7e0858aeb01aac6a8b5..c9ba05a234ec46dbe5115de6a83221f09e5e3d6e 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 c115258960612826679a63432dba98c323db2466..75095d018f259b9964f4e675e6ff4b6cfb8ba7d0 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 a7ae61116a97e2bd8dc25ddd6f038d6f5ff69c9a..be043b4aa7ec4da0eef06905c74ec1e35894aabf 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 b24f9511266d54b7434fd64242b49685e4a8b6b8..eb1f6af0296c9c2cc8f139182fee3e64ad0f6740 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 e85bb1c757f4adb824e9d688a97333bab384d76f..fbc8384d55770b7f1e1df2cd0e4f84ed0069aa2a 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 209c1f3c5597f38c3480c48d03bbbf58c829bcb0..ac81bae85c0e304821165f6c5841b3fe59731101 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 9321dbb6663f9cf06a23e1bff38a062bc229c040..58847c55bdfe298f880ff60f225ca552f389c585 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 d39b22fea0ebfc56a5855d55fbb815b9a4e35fd3..c1a957fb862710636cef5a170867f8f6961c68ca 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 0190462a40abf4ad286869a24fe1a8120ea86310..836c72f544fc2153185f038b69eb5734f46b35ba 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 3160558aa2d58e994b07567681ecbf0bc91f731c..52ecf6bd1a9e802fbe5077290a0169f58065ab27 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 8bfd68d226bb55c9539bf41a8442267b4f69325b..07f8b1cafa7db138ebf59b38af80e1b6a9034896 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 ce21f5eb503bfbed196888e8de7d0a76e8a704e0..f01aa89def5fefdba9a3346639b7abd4102544ac 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 e77746980e93538000b115f480ca257e2a4132b8..99f7527425d356a44dd475e626ff848051c0a26c 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 15bebf31fa5aa7c4277836f98a129525a268b9f3..6b0d57e744d930809b9adc7640d7c1fea8bb822a 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 2c75d13e9c1af7638dd6d805d3d1d2c29d856ff2..53e445ea525d08cf6372b4f6b8dcff7acd8bbb85 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 803ba33457d0b92f5b1a7d49619c45bcf4415d67..75e3622954615f5a7a00ef43c0556c0fdfd17cac 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 94b8179966d0311a5c7cbbe6828e4fd1230c1716..cafdcbb97b70122326362e69637be899eb9bc515 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 265112dc3aa51f3fda5f5e32ace85f0906fe63e7..0e2b8d0820fbf21f6cc4bd9d2d45f7145457930b 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 79932a9c0a6343e600b19598699eab7195f55d62..8b069376bb0496f6b956f64d2c04b64cb733f178 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 7a1f3ae846f07dced37b0b73c5adcf3967064497..09f5a2a615ee1466a2e026f39e5c639090d39c6b 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 e4758d28d6251b86ddaf32040e954ba18b64514f..63013d2c12e5afe73bfb9f58294cb3ccb19297a3 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 3a1fdbce5a357b65af7c0ec6cb5dda125e4ba3f2..06d40026ebc62eb5deed32c6067379dfd3de5d81 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 c5443ab03e861bba7c4f5f1b9c8a1f6013bbd300..aa77e3e8fb5e504338c72e5a05262c80895722ad 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 90c0831db222da9e2eedbf6c69fb8bd257a2d485..b4351441b4406f6489d60d39553d97aaba21405c 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 1668e6c1764524bbd5f11d0ffb712bdc8f9f4767..5d66bbd39ddcbd7cd23a9878132f6c1130545c62 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 109f09015feae94918ffc93861b7fb8708b45512..b3a7ab29c86ce12f90dc1055637cd0a2ea351b16 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 06cb68a9145752612513a203bf824023f3313f6b..54c37ce1c80e5242096f945c81c7929029e5aa7b 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 5dcbbb4cfc09b239a24dab961b4cb416cd544ba3..c8b0c96c6b1ec712e52e6d15e0ba9fee1c29cc36 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 421866115ac380ef7c85027f6ab0886e9d012481..6b1114b5e4cef16ddc20d3010b1d684dbb4f7829 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 6c47202c900788343a8c513f8ba6859314e98676..a27c51dd40d90c7d979d929f4ca27a3a37161964 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 324c395a24f33eeddc153811b06dedf90ce0d859..997010af8b8e401fe714a2602832c4f4e54df4f3 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 bab0860fb487d9f9e992dd4e0cb578037f57ad52..776fdab1e4c75c29cea6b0090449ded785002526 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 320902099bcbc3aab01f25ed5632d920c90c4923..a4c03e7e3d6a5ec394d1421adc5d3b9821c54440 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 40630d0e19bd584aac01e39e604d24e718496a7c..8f1d16adb0475259d31dbdbb243709688a032301 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 4fec86b706bca665d629fce44388bb150aa412f8..a10c870c8478a5c6bc750fa2981012c049cdf308 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 4454d6ab4e384d75b9ada8e77c05e35e05b01083..1b9bd0de11731a571d5a75bc6a263571bc149514 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 70e75d74df5f029ce4626640df4462a3e90df8a3..41e852e2a83e18e6901f84e86be39fd3ae902989 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 f56e505bd511c487fc34738b6ef4bec9179d158b..e5272dc66276e2650ddf9ecc151be9f8610a18cb 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 6b1d9e59a3d3c299712a99087ae089f9265ec1af..108a989f97b4f9d4feecb7e8bd10625851509b1d 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 77a7a1afb6869a7ef0d43ae0ecf7b11326aff0a5..dfba1a63664fcee83a1999c3f972bb2cc0cb2c0f 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 73275d6d9d1440bc9fff672c39dc81298abb5c77..b9f81b4dce40ae3c47363a903e8d04f9ac790ea3 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 1431a185035aab5a7a9f713f43be282e4f1d7458..a5797c841fff2842ca2e367163a749cd064c8dac 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 05d2c3a294307a84fefdeda56c17bef18c774c8a..3f5cdce2e48c62b0fd4a7e618b175965dbb1a1ed 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 0eeecba7be686d191607e6dce5265d9a2002d21c..8da5118d2b7fff1527cd272ad65e9664b691b46a 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 055687dea8a6af654fd42b1729b48e07e31f4fb3..18723f2e4fd562e540441665b558ab90ae3e3159 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 597d7c144333217c0da1b2eeacef29c49c94e047..af088f33d209b22c90ef53a9864186f2aafa9f98 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 0a9be549ae12e786cab1e7a7b00160041851f21e..5a6ead3738ffad39222bf66d62e5a517b9ec135d 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 a48c2e24ebdfb6d74713520dccb5df786a8efe4e..140aca35d4e7becb9394226dd23b3ccb6ccc9630 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 36b019ab301bcec97c7d35841e042e6111981600..e2cea8da237d05412192e327db3742aae2a4480d 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 d6e12f6653d4bdb687424250339b1c90b39832e1..85c4904bfa6fdd41ed20d4ec1b45c698b727f873 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 c63a902ddda04b619461a2f5d8ae84052acc6a05..0f738c7c71953a3b8d31b4ecb8c8120d80d4c342 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 aa247865ada5ee76ccd55bee4628f3f964380464..05c1fa490d0facfa16dc29e0dae5b3170cae2828 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 309be27e5f86420180b92771728e1ab8000e6c07..d82c45e55eca5e937a9fe379fb12f702c9b2f094 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 6e77ea1978b1f17a2274ebe6b0b60d1a4e7ecd9c..dc7e925f770d2d0c1b92452d87e7c490e0763a6b 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 28e69710b43db55b72018ca9a1f70ff12793cbbc..b76194e1bf298e24ed7acdffb8cc6d2103960cf3 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 44bcacc61a52c6c9af87885432ed3f96bbc5cc4f..e15b880080ed9d82821188fdebfe7065d50c443d 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 e5fb8d9152b7fbde5fe5307dd06e8e91db17b78f..b512437dcd3e63eb8881b55ea571030e31c272bb 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 b92c4b4a66f256bfe47f541a21c156c9c4d046bf..a40a61eac5d67ee2d7f220b58edc989e3ea0911c 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 7170e3c7e0c2611fdacc3b66aed3bd2181960fe9..5f168915d24819d0482b086babb96693d8655cd8 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 aed7ce35ddcfe2afe99e15d43a950ed726d82fd2..52de7559b286bea2e093bfb44f24b53091b1488f 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 fc2a063c6342ca2f36555593cbc3281b65f12196..ee9088f6aa29da7e98f45f014a4fa4fe1b8ec2a5 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 4ecdfb838f97eed806ba133a9346ac7cfc6221aa..6b3d5391690c4b57e5643afd2d3a030e69858ab9 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 8f1d87b63865be45c6f8b768033b631f10160eb5..4657b8daa10e42857699363ef0f95c5a47e08e1a 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 db93d963ba35f98e0c2c90c671def001141fbd6b..2ff1be06e91a5fc8e868194ca687f99b62340020 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 829d72efb272cf7913ed66b5a730dc64dffc747c..cf8c1f57aa77a073a66ab94410d0a7839af63751 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 07b839d12b415359557b22dc3f58ba4b5a28bbe2..594d9ce837e19a42cc6a2e84587ccca2614f6f08 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 b7f813e334fbb64dd577603651effbb85e6e8124..4dfe8011432bee03d918c840d60318043133008f 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 f5eadd675a106397e65bf1a6f86b60ff1b89b136..03b56455d913919d6d6c49dc4e0c9959168ba02e 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 9139ef524f2193e50abbb0d59d178a05c75c06a7..885eda51ac2458c772dc4f70dd996acbb14d3cb6 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 c0cf4f9f360f2f4a010afa3b4940d6718db8cc4a..b9339e458996f0db86d4801d48151a0058ca9696 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 db3c235a50b989cda5215ec7f263f96d782cd44f..d1087602e1dbff44b8500ba45fa5b917543d4a91 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 b008342973159250f7877d5cb2ca40f453754717..6ad88dd0128221b438e64501b2131c2a5d3084e7 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 86963ab3d76ee23d2097d1dee8bef417787fc605..06f528e6186008849491ed47699fa95f7f7d2400 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 3e757eef4b8a894677123b6de1340e10f0b7f747..94f32c679d0fc2287dabd7f6304b45ccc346049d 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 43a4d07c6cbe7f25cb19cd166df63e3a0d6748e5..fc3d039cad7e43136f97c4510001cd290ae3a53c 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 2caaca6ca2a27d78789f02bb91b6ff938fca59ac..41c065b0907cbd44385652167ac60a2d67421548 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 7233ef95a27a1d6ea28a3ef3583f8b4e492df1ac..95d0fb910179fc0b83872744511ac3c39c6cd2e4 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 91b3a75d90c4bec8c326b02b257c195f664c828f..cfbbe2c43474609b5c0ffd9fe0f11fedaa70bf1a 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 1dce9e59374c4d3e4ca4e5bd9b66ef08c51b57c4..0a6b52b5bd5fc478f1d32867556e7f63ec66c31c 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 243dc7b67171ffd06a688c448d07ba976098a5cd..5bd0447a34d8e40a8d112f51877a34401a0320a8 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 6a2c18bc71970a3426c66458fe30846357730fc3..1b5f324bbaaa6f86b139ab9df107d5b97ff0febf 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 94d7ee101fb7567a0b85a72f9187d194fb0b1184..d5e014d6a0888c832e74aad80f01be2e425b4df6 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 2b277311ecb4dd2b8b4c4e5eab495a4d87032b43..0719cb56a6aa2b7294505db24ee6397e1d26d6cf 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 f0377ff9e9d58fe0979ccb56859e8a0066716b80..a3f3d766be29e4259e093894fb4d12f61defbe39 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 b4c5bd8110822e863f40b74c60c0d551eb130b78..a1589abf0d44d9e51b54a541e2f832ecbf0ddb2f 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 73e7bb8d4c94d0a1a6861a957cec5f5a59098293..8963df25acf2f66fe58f67f98147ad6cf9defc15 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 97a09ee8a9736bc67016f5a98b7ee9a1476d9faf..fea6f0d759da3f765e14c6a47b5314b3bf98915d 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 7cccabbcb37fc9544f2969d6f44f4419f6c76150..ad726f54f9afa05dd3dc4c3028b4a186f57bd737 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 1f898a289e572c5312f2a8ad7f34b19d3a73ace9..e3afeaf5d7f0b0cc885d61f85bdc50659861b1c9 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 7549caab4706c1f57583e80bae1f36c9105e2c0d..357d8ffd4ab0dac0f75cfa3e06f08d27c6088897 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 7a2356c14cedb5378bfd1e8a627f2e151dc160bb..adc1240734464766ad15980bdbae33937395cc9d 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 fb40630251f3f6ab1a03bfdbc3b6c46f1e834c6a..25032f2b99dba2b64fe3fdfd023221a25754ce0f 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 f718169e6ce44e4337ad033a2d4b6750e7062925..7857016c09753cf32c15872382835ade0c235149 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 50e65389cc503ccf8d865c7a6c9d9e61b1ecb811..53d3ee496a6cea8ce5e42db8fc46bc24f9ecb46d 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 5b85081fe53c668911deddc5f2ab4013a1a89f91..455dcf1c475abb748fdf2a1937bae92103881b0a 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 c2bc2b0ac35fe8a35a763c36b86e24d382e7a9f6..f4cfc7bfa96dfc6ab5ae462558688a824de9d331 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 79888aac94d6178abde1f21342cf7f0538849b75..bfaa26a2b5617b582f5c33cfaa34c484fc03487e 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 4d7acc33bbcecd842dade0a7e07f2fde75cc121b..8b4ed63edf793f89701727799ae8bec0ebd72f44 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 60291119bc07f16922c7e765d4d15520a8a4939a..15020144ea5e4891acec147f7218d0910d56b1ea 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 71debb943df7a6f1f35e4c6135a2610cda90fb0b..be2f96b8a366a568dce2ce54f5e5c442d65c0cf3 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 53252f3c98af273b2801e78efcadb2c5c648ee88..571e3fedcc5217590e027d28a52ac26b75798ab4 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 07a80077de1a91f3e7aee95a3f6631a5f72d4bf2..73004de4d06b607f5a63f05c29109bf564702404 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 a78866bfacbc205916b222b5c0cf5604821bc418..605e0b14f7b3c3e9270fd01b2163541f9e9f410c 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 afd3afc0d4f2aec6576f4fdb1036151631676a5e..d8839882a94d6fc521dedb9c905cf7488e406a09 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 da9862001999a80449fd50154f316e45e25bfc61..10d05c2ff1dd85118b8d298e5753017ec9f073b6 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 58ba30fbf84e13d36fbd83df6ef23766b9cd556f..c2b5b193b7378074a3ed9f82c26c40089ee58864 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 b926d373aef1d0e062650e6647476927cade34a9..80bcd56befeb8c09dbcced0aa6336aaf4189f9dd 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 bd260517f4c29edf57bc0f301e54c7415fb70fc3..0cca53c856beedbfa208a887d45414e85ed2f479 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 85884d5d18ee321dbe971201bf68eb7fb58e53cf..23fbd6db0363178b298175629e49464b1174f653 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 7e5db0e526f523b442b7fed2c6a66e96af567d9b..005a3897287f773c95f43464a4a05590afb6d556 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 38c20493199759f0b8257b414fb6e5823c3a1e0f..1604d2ed0afa64ce54d1ad5100a1c8598d41c908 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 e2c1b0a209b4759d82de483f7436a235128da3c6..52d3c184e361b1d3c3ebda8db7ff87d65116d5db 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 01b9bbee121aace218a7de9ab4de40422058e1e0..92a7e8ffec419e81eb54f138e95aaa0e7a4ef77e 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 5fad9aa5c8919826627ddca9c768cea0e62fe9c6..21dc8b2b89d44de081cfb8f156c3e7e5d349e6b0 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 02338c834e4a62b4300cb0bd03d9ae32ce08057a..c504aa5bdad10c04e712b07e4c92042e5f9f158e 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 c3b19fd60e7bc64c94b0eb6ea06385d5e6561572..dca75e9f1d2fbe7a633ede66c4fdfbab0e8c4ed9 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 eb91ef65eb519cf48f72cc563cc3eebac15818b5..e48dc98d70542b7e81ca0199f9554df43f522965 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 4fa3a8bc95b9235dc94eac04dd18ab1829ec3b6a..75bd875cc8b89dce1bada7277dd80281ec80af22 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 a7f5787755795922064d3d8b60842ce542e191ad..b98c34a7f8e2b4d955540d1261f4802fd542a9a0 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 773da3f0930807923b4b04e04bb1d4cd56c7a84e..da210e11e0a2aa23f3c568314b467fdf5b64372b 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 02fd9875032a1fcb0d6ede885c486ca8d01f5217..456df7d68a26e0d3e44925aadead5f37a8b0fda0 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 9b8d9af5afdaafa6f30aca62cea06358ab46aed9..acffe53b88d8ee4bb461a4de71bccc416b3370ca 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 199e98b18141ab89d32dadf5f7458699d5b95148..ccdb726928f9fb1ae8c8b72c95a5c1d6e235fe6b 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 31a64dd0d1914977079dd4f92135d4b0dee991ed..6e05bad70385a562330aaa341d20d34a73df3c1d 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 8222cc5860145bb24d0080be698a6cb5dc5479ca..8a87796f0ccacbf05249368f8fc45abfca1fa8cf 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 1cdd82012577be5fe5b75279e9ecdf89c14cb10f..3e911d65faf42eca4951dd71d00cd55744d07fbc 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 393963bea92b0ee587586c66fc87cf80ffb93769..287fd6120aba4774a62a7be172084b37ba9c9319 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 e567e884c845df1d7319af59e5f345b7db428956..da24af14555cf9b29c0d2455d133a418988e8cec 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 6a217451eeabf0a6cfe083ed9cea62a34b117780..9d5d93f9f006a0898bac0cad57252338656e812c 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 1177e1fb09dcde0425bf69abe1f43bdff3c9d43d..1d7931f95708ed229ba62837ca2e5fca2055763c 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 f09f7ae99856e379bec013f67a81fb503f4934f3..e5e1e4191f9f99d755177d8c0a7a642ae3fbe1ce 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 08892f7069f19ee29fb280fcfb8d8b6ff1c1d93e..7d8fe8e63d86a31d7267bf4e7b7c27c41ff80962 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 77b9344aef86ea6da84a8a47a0acf87563900af8..4f282b1697777775182ac62b167a33d7745a9412 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 99b9e6e96b99ccffd0ecca9fea6659be112afdc9..da38d473f5b728fb783f2a048623b01dbcc93c99 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 f97bd75b4e24a80171b3a7b7f9337d2c64c7434b..fd81d4ca78ed357fe963a09ac49de79ed3f11592 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 7eb2431e3eb17e0e83e1e1b0f77e93091cc579bc..32c64ff6ffdd3f2cc77316dc322a81058fca20cb 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 b33d18957ee93334c0a65c4a1045e1991f0f23d8..d70230512bea19b348e41b2cdb0c34f843fa90fa 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 4acfe37180194dd77cdf1fa55b32c7a59dd5c31a..a951d19848e06f8d8a83adfbbd567506b6f339ab 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 d6c25869acbe5a81a139bbad1b171d4b1944c1d2..b32b22736692b04cd7950f403d7ebd83b43eb412 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 7a66874fe538ad69b3683dcb8b76d890c882d1a9..004429248ec06aea8d24f50ddcb0e7687156cc16 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 766a1ac5c4528a9930f4f8faf7cd7e53cd9a9427..8bbd6a6c1407fd4d7adc53cc1b70ba413835d233 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 ee681b02d856b1108a999c015f893b8db8eaec26..82bff698155b22c491b7ed4a32aa5a52427ff10a 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 05063e6fc084db9a49aee51be644fb22ac620a56..3212b4ffab683bd84d49c04930f27659d27eb265 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 b4a5e3460095d492e55f2d6ae27e628acebfad59..3c02b5c16e08036785f70cf2542723215d1af46e 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 6590096e7e7504951e8a4fec9fdff5cd2897a9ef..79aec23b8a1eec5beab0a6e08330119c31bbf649 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 dea7cef3572ce3b79450de94f04ed70e7c15af77..4f104ad289f223871113e8f9bc6b711a7fac25ee 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 00e1448457043be67296cf7daa908e307e8d3297..dfb06efd340aa1941ec2520096a838af0541671f 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 6c06cddd70fffbffe0df2ec0dfe849630989e2ef..73afe02e343b2f7bf910fc6c569005937c6672a5 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 782f1ae3795c9a83cd2178edcb0a68fb38aff047..6c31dfa0af6d75f9fb80301eefb6b99123252d02 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 1ac539fe90fd531039b97083ea35fa5ce930e115..9668d3eb28c8ae11c491e30fa060b82403374073 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 6c17e49ee1b877de4b82f7bc664ae907464931c7..b5773ae32b78259dbe16d425fdeffed06487ba93 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 642a0572ac03cd99e03b4384547d177473c62159..88a516d6d428f010d234dab0169ce0d1592e933b 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 8954dfa95bee8a5cf2ebd392bed75f2c0df30935..fc8de4c4fa2055db84ed5e70d7f7b2dc1297946c 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 bb7f58dbe9ca19266b8cd1e751c49daa2f477ba0..e3065790c53947050eaca12bb761281a8e3fb061 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 d8538e74fd470ec0701ae298b0a36ddeab44e00b..522786901c9a79203a2219eabe9e61bce45f4804 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 6295188e9c420e1e87efd4f62ae211442cdacf9a..803258b7c8a26bc995d9125f2d625480090c1b8f 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 91f48f88721be0d68ccde1c88bb36bb0c2768eb7..93ee5c12d00388d1bb817baf8493684d664b36ec 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 f383ed2e725a41ae608dedd33d91a3e3781a6258..6e328ead9a48d0ea67887d343c26ff613b8911b9 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 fb002bc963e53cc13b51bdb83399a631c127f59f..0174f31f19da880293c6e9c07ab843aff1ff0782 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 45dcaae432b6786ecfc036c31990300025694383..4a5fcac104fc923e1815bb70b9578fef7ece8dca 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 f5ba5bdbd4e8f968d1bccd4f24b588a3b183fb6c..f0a0a52b17662546af864f2352ce63743816757c 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 15a0313b550840859855cc650f71c99a790af630..9228002450f565922e11d900ced1e32e4ba2b5cd 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 80e9e7c5ac207e5cd7799cc44d017c1ac3dad142..39840a708e749b8da2715116db540c3eb252298a 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 6b7b095a384ef4a8bcc6835ab0d3b55b30486586..4a6c188ea4c857f2a483f52189fbaaf6b13f97e1 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 d88b2cddde0dde259a0ac66cbb31f57a7e217f49..d16c816744e91f0a018251be2de94923abcd0005 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 a56c36a5ab76526306884bb695e00cdbacf6b136..83c21284bf28e3c4d8ef032a3602bb682b5f5f89 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 6107c069d832ecdac9b30f4819299732d335d885..153e809811e692aef590f7adf771f660728684f4 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 5af2d71826ca733724a91bec157413623f5bdafc..f9bd3018047defb3543aec4402ef257dea22e028 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 4ccb11091e6a7cccbc090136bb3a268cead06a13..dab814100b16c77ad7d94779a4e2918390aced5b 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 4ebb6d5b1a80a88744e08e7053fc4bf6db87e65d..ae5b7f9cf875a9ac01b8cba09fa59bdf3c82b85d 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 065ddf82ead864f8c6049ce4487afb83032a053b..eef30b4e8bb47e093d1ebfd80a9623c296094e08 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 2d225960dc547b7030407e55ad2f99598fcb47fc..831da75851ff5af7a4277b97eda50cc35459d1ed 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 330208643932dd39bd17a2f3d9e819ccd7f663b2..d9e5bc0c94fcadc36d52ea28b509231429f119e2 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 f5594b5e3bebe37f164b211695c3790f148f5ec6..8f48a73d0dffb54d1fa50f224cb7450b0410213e 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 52977afebb1c7260c788e2e1da3e47923492be49..de880031ede5d5362e001c48be1a4dc39f0fc79f 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 6db1cd6ed33284616116d2e8033f1a883194e8bb..ad3cfc5f07506a15fa2e0b314863570177f3b08b 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 b89b94cda5b8c0140de603f9f19fcb93ecdce8dd..8732257267bec70a0da1836392ea6960ea9ea77d 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 144024706e2a1523bddf8b450f90816d34d242d3..9e0d743e22d1ea4bc3092d004d2a8d72264bb8f2 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 be4c6dfbbb9e5f4f7f4880621743da963a1844d9..b4b33539ac656a18283e6716312406bb5b9be646 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 02a99a8a85c3cc0f6193bd4e4cc133ef915a58a2..1dcf38b407616f8cc8af90c80818db74c7a13992 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 bb4656d84c6950f55ebc6c25c4dd0bf4625f311f..6530a53e218b2a8dc87d4b987191a46775e27b93 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 071adb33a71c6ca6f40ad1dc2cb214e809437de5..b0587ff3ed32b8d7370b11833d110afd16b8f539 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 aa322e7caf65b8f79f9eec6435cc76518034ebd2..0d6b86108a67bf98b394a860f13f88115c05aa62 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 215fd24318d991db9a12cacbe3a4c58c740ea909..c46c1002379ad1a8a725171599e5468c60ab2a4c 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 4213ff301877d93a2078eccd87cda655c146739f..bf0e0b7a63c8fdd074798e586d85a388810e4a42 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 05ae24061d43715acabdd0a4c494f5d422a0931b..a08d21a720388ad820caa3eaf9f710f63d6b6297 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 3d0eb7d744250b00b0853cfa822f9ccf781f0261..5e255036a9cedbdbe17ab0b029c922ffe7ba23d8 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 4e5a268e582ec6ddbb1a35575b1095dbe7099804..191e28a580619e39f332b564f72e6f40788f0c0f 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 322762bd84db7ccf96297d320678a7c4905949a3..1c0dc5fd73c4615f99c4c8a7e8b8d6f47ddbfbd5 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 658e5c7aa109cc0f2fd46eebeecedd2dc9cecabe..28c46e0ea86ee2b04ccfb44ca066636583147e1c 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 e23a192cea621fe0b321394e1d468cfe8cf8b591..7165d2389197ae3763c3af3e9b817a778916ab81 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 e15a1748b9a23d6bc44d217ff090543579d95b7a..e81077635f10ea9247d2f8e7da9e4d80c05433c6 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 cad29821b0b26e774064da370b5a4418afcafc07..5356293b633297ad51be32dfc88d176c20a952cf 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 964b9d3ca2540a9f16e9876417ae31a4131ff6eb..c053d2bca47fe9a907a2e10a6fa2ad428eee220f 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 babe77da9a9d79f10f8ac2a35f98b6bfa9289c26..e4b4a774e4cff43f76f04372b0cd0f26ee0583ae 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 4fd90db5fb404a46fb1103e3b9b49084965ea5df..0a07c17f8f079b1fc2380a0d06fe55b44615a22e 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 17c9aa7c4daf0ab5797769353ad6f9565a49b8ef..d24cecef8ce17370d5accf4ea7e4b3c211626bc5 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 c972325661ec9563e1be11cfbc27721c5f763d1d..bd69502cfc2a427827bc79c0d140c0a1edac64ac 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 1edd2a3c5f0d3e0cf4843ba628c869bc6995d5d9..307926371ac22187cf166c8fe1b53ec85977f2f2 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 bc439fe329ef13686a8e288d06c6f94c0c715749..a92538ef34db2b45604b0655e122e5f02cdd2a40 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 1c75251de920bf1d063cca6c30d5bf297d51005f..cb8ac5fde8d1b4f126c578ced09962ced557606c 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 84636f80c17d1e850e3a253e9a10ff06438e03e9..84c486a8a2a37970cc1a06e27b4afec8de24e77d 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 0147bedfcf51bd1f27dab57e74d315add6b5ff95..c973ae22493deee3ff1bee66dd745b927bf3b4d2 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 acf33bcbb9ea99b6ac0fe8d819a74edc74bd174f..d79dd7c3888dea3d74b384e46f345553c05232ac 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 e076ca33fe422af3d76e6bd3e4c46475a8687574..303ac5fa94dd023d3ebb7e8c1977147e76393be7 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 2c7825b1e3adce050047cbbeed03b5086b539ab3..278e2fd4e303185ce05b71455f81d4cb1466228e 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 5bfca6b540d1a7a3f6642bc2f15e905f15b62d9f..0ab93aa8988e7863999e2ecdf2627123fd755fa5 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 5eb5208d3432c76f3f0936a6b17cebd9b401b2e0..b1f4eb49398bb919ee314b674c56ed9dc6d5f3e7 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 298de7f4e73eaa55626b89892b0f1f7fe6c0a159..c6f6f7415580c61d2b7092ce7d1513926ef1d346 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 54cd44633883672ea7ff17d8f45c040026e42bdb..280c2317107390e95a2b9ba6327309e5009e4793 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 05780b427125a44549cae629e1f3e126403a0277..9f61181cc1282607ca2d9151f967ccd1ee0738d3 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 bb37408b01610cdeab2972364b251cc5a2b1140b..60122c6aefe42a942ac67f304ef2a45a349a9fb8 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 ffe9eb1f3b3e9092c83cd2ce94d8e989d5ffd405..af62fbd0fd92067cfabb4680182933f4346944ee 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 c31eed5f3838ac67a1de671fd472bfc2824a2caf..3b6880887c16b816f29dddaddebc2e26558ba637 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 27c44c92881f8f9a3d69fb06bd07cb0284462182..87d94be56dd48cce4188fb15cd712bf5bf310678 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 ca7498cd6066404279bf29a05bf17f4d4aba59b2..db3649acbcabca575892a140fe51271b8d45fb07 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 ab776e1b2303b12bc60580225e2e512703c06963..a2b83a7eaf3762b1a452ece2e5d31fc65c5baea7 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 2a191487ad7ff4199da9e2eba467314d2a6f624c..c1b7b3242291b67d91f2299a16196d978a9fa451 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 a10d549d6637848d99d4f2a17556b5616893f1b0..e7c5bfd993c1f27523850f0bf84ab84f011b88e7 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 456c688c67f091cbb56fde350fc87016fe9ae5c8..e7f73f1496230d5ee18c1a217c1eba40204b4307 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 5d3a9d7b2c63853f281293e8e28f2286f067908d..3ce86847bac2e5e9f808293a595fa877cbebdb32 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 9a8e0836ac7e00d1485ed3b41874c7b6011eaf0a..c213ef83b02d2036bdb1e70c491451d0144273a1 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 a8b5f3218ae97b5d87713d040a5c0085fd22ff1e..80c0b189fbf65810acd8aade039f1a76fd2cbbc6 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 7d2a64779817e096415a9a61042fa4d907ebc227..58b86cd84304771efe69921df2997ef7f4085686 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 053c8cb317147a9ccb69d3bede9818555db3d2a5..16e2b48f075686487f923b207c04951eb1688e98 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 fbca1c72c8ef4466bdc92cfb5b80feadab5d297f..bfeff9ed2120fa0401e2ff5793790f0ce6e10294 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 60fc3cab762c6bc4586e37b96bcf92ae86efa32a..616760995e2298679d7c754a2b0017a067092320 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 97397a3f642b6fd0f505824e7dfc3def7784090e..eeb6885e272366c14e78b498f5398964829dc1f9 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 0ac5cbcaefc9d89a4e4709d400dafdd596927ec8..ce20c77700682daf031f9a06f6b3d7155078d2f9 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 4a0e5777bf14d3596622035240e3389b577cfebd..66214877805500363410bb8bf493665a96f7a951 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 9f7ef3e1f98ebe067ac87040b7ecb6f29d6e95da..1dedef4b6c926a085cae2e8d863c6ff0200523f6 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 47b2e2daaac3ffd7901a8c9e4bcf02a3b50f5794..cff95e1355502cdc27b0fcbf19ac8d61de4e7cdd 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 f3f34edfb32e976d9c98ec8f74b242a273409c0a..7a774ece95f20a499886e2797759de6cff1a6fd2 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 d1a5b114a29eca1a83aab9d0443dd0a6cd6c1957..3a9dced5152e1abfc2bd655c296910a1b69b82a6 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 910314175b743d4722a6ec89e0c5f1bdada69438..dd32a09ad826b5749bd2f7456d7750dd31a98871 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 a8f1c84d4295a96fc6f38327150a1a83a4644a2d..f82f098787b9ee15608df7f72351a3510cda888a 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 4f4cbbc7bd5a8a18a531dc2b9fe4a0c3ba971bb0..273829449530fba457e6baaec2d84d60e3f2810f 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 d20ce4adb6089dc368b79c06597fe8b4ecbcfde2..041af664434406b0ad79f0709dd42b2cef48c4d0 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 8c2884e6c88ddf49e1eea7090c8ee3b97dc448c6..9c2ce992fb8f8dc0ac947d90b40ec800ccf707ef 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 b4c0b427ce23d64f790edabb51b6bc2ec0f89d0c..e748a03888c335a316aca1de04b7462b4584ed14 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 d3861d360123cf1ef50630d9e7fb4734c776daea..e35972c11ede361914480960cc62f716857fb609 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 d8388acfdb8745df058d5907f787e9c3cf704a8d..45f2ac102b2ef6963e9f85c3724c3e071ae4267e 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 f13219db531621492f1bd100bf7e5872158bd967..1ab8179394b4b155157e375c492c5f4dbcc67da1 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 9408049f3fbb67a925020ee48f9e3a8adcc95cc7..35636f22e7087a661bc895629596c06247f63dba 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 b6257da3961ee6116c5b3225a471ed048214194d..7bb975cb2e4122c3b88adda85c942fd9bf75efec 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 4569981df023207c746c277ce167cdad7de912f6..c61e0520bf518dbc8dde3f2d1ef382cb8e13ef4a 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 69cd41d457355b2d5960520f86f9cd1e1de8b59f..b7537bb94528e765c8da7c16cf9aa8d521e7b773 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 8df78f33f570832539deb4c2a6cdf5edaf6dc611..14858b2b80d73d5d5277306d7f153c5a3fd4e533 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 aee8fe199df08b3447b1757090c3e54042e470b0..f6983d9d7454e55c9178a0f2a3bff4f41043863b 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 8a5ffb56caabb788fce3f8f989298cea9a36ae1f..8c5f2acde475828f4486c91ebdb2c72b4b99ca59 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 7c98006e1516d024b65d25209a50cb3a474e7997..d04026cf6309a884c006be329d0f3b613577a954 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 e9650d02a087f94c7b3859327f877fd6a7039c66..a636323fb591e47a55b5e5c222224a336e72c8bd 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 cb221e5f1ed611f916ac3f6fa1ba5552c1f938d1..bb2453d76a8bd38af6b9c3325d74accebb8f3fa7 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 fdfe45a951f4c6844e09a022a14fca385aa59a77..2c18edb9b3fd8fba7fefd8fb4a57675da1a9cdbd 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 ac9b93f9ec3ae2cc249fd7e5fe48fadfa2c02320..8d5eeaee9717e18df85956827c22c3c013d90e12 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 642f202b8c0a0195851243dfce4d3d947a52c385..4acf34679e22c811d3bebb54ed61d7dcea62cb45 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 eff0662fcba749fd7d54b86d110c140240dd3f32..7f65b49c2409b3e356e5bf3b174ec784232735ac 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 534bc32912cbd33afb8fc3558b6e27a7a52cf00f..882705517eabf108f6a79ea1ae75736c92c3ecd4 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 c65d3dfd521d98368e2f08a6e19e8b325e23d44e..a47a55b59097cfa0231d4eb32ea69bf4a160928c 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 2e5d14d7ad03e4623b18d4976fc7dcd105f02eb5..1ef597dd9963ea0086d14e9d154300882db93e57 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 9c47e0c852b0f00c73b0a0c4f5f662a977ecb396..3021a65226accf2139cfc154596574c244bef56b 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 77a0f77b5277d964754d8c31f1bc80f76f5720eb..8c5cf454d66cfba1d76dcf86e7e0c6c254e208d1 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 5b68ab264a7d65897260b79457c90290ea7ae5c1..350c37f98eed32f3ce2c2304128cc388d8d86e9b 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 19709a95ca9439892e008a23783830855e5f1a6a..c24c3fa9a9296401b6dd07d1cd1cd4a11f7e578b 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 035cc519c01883386770db1f3a0fbfc987b9d788..4f8e1ccf2ff62dfe032f8decda6255a89d8ea03c 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 51aa0475768de6795b5470b80625a03ffa43336c..4018fbe3b1218bf22871cd65e9239e9143341a5c 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 b5ff1ba9c864727b53ede0ab08a3cbbfd1fdd481..84478321a364319217da14c71cd27465f8d2ce22 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 9ddcf812b81b1c0963221eb3c8a059959bbef759..0553098806a9e368946c027f0dcee5e0c7111d47 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 0e59b6ff733b67373beea40b15ea016f69864224..df828e282bcd59ef608a0772c504cef66cba25b8 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 fabeecab20e6cb84e6c2efb2a3182bb43ef3e21e..9f0f56cb7a2d2ee135799bfd467928d852931d50 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 dfe105f3eab4b96c284435850636108d18f7fa7c..d64a71439ec626f7cc3e8aff0dd3853158b4ee72 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 9708c95c91f806366382c04b64d65a4c8b0ca8c9..51773c1ba7fc6609d2e4ba51d692eeba4d856703 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 77a335dc0b987b81612af7fe996fb85bf77811c4..d7587704f4b168582ce3749eb5aa421f77490362 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 d1f1efc7e5978b8cc5748ceffdc3e5523f570fda..4261fa0dd17cecefeb6a6e403b33eb0b0cf7fd32 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 2c703f94e657c7ac9d202f85a715f54968447100..a17d48723bdf13c2d5c54c241fd8e6125ece4927 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 302c8dc52156a76a7b31b14ff357199160387d47..468fb149eaef1897f58d7b1516bc28d932c279f4 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 f4fda81ab11cdc04e00c1f3f64495fe36302780f..d185c45af5d0a11608a402074a09de46f4763a85 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 5dff61032e21f69d6aaf7288cc8c1caa6a41ada3..a92c8398a626f9350d53941481aac7e703025875 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 046f307823037941cda93bc841e2ed11e842250e..5869f8f02a4755a4beafa0f6d7ad5a4b3a549398 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 3fa7d6d87e4e6c279e378c69235822fc7ea9c33c..d2c88a787ef1077cca45570bdf39806f8c2cf1bf 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 cfaf4e6bd276f9fce971d5f0354bd656d67e7a1c..8a32f05e9e25a59f28ff50cc0fb3e0d661d66a78 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 e4111f7dc4b49b7b34a28d16bf575fdb0bfba4ef..3c155cdd247120b4701dea0606945acf1740cfdc 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 54c69e1ad588c8b1dd6f66749658fffd0eceab65..b2b703cf030288ed18d2f119c02a80b7d48e85ba 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 2d9641117690dbe26108e8a947135f676db56807..c2eb8904bc9e022e35d32d3447e7fe2bdf36a773 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 420e9c85aa500530d26251993c3841c37e4b2344..2641fcc0db34a5fffe654b52fa2d58465c6910cd 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 149629d5ec5dac3d1fcc8cf9356184021df353b6..5c559d7749d804958f9cb6a7580636f2ba69a88c 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 7c6c243fbc027b67773f80c66da6afa3b8049d94..0622d3952d706fc105f5fa51c4630aa1ae14a484 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 96f4f2a9e861f91216348fb86098e1e2b80c1ad3..5423d89b6e1435b2717d93fa9f7befb9f38849cf 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 d7e2949e818dcbb3f4c02ed4760d5870fede806e..9e76ca14753d6d1700558c51592b4090fb6a774b 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 8f10857041b4d796b563510e79b2ba98cd939978..c5aada5ecce764754645d0a92dda31ceafcb072c 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 8c2784d5b3e2a3acc22dc514e55f9825473789bd..ea33280052d9e3ddf8d394124b05fe0dbb68e906 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 f6482a3b115fd8570fa9e6560d6990cac170298f..cb256467d2e88958a632b6bc14348ba6d820619b 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 967fb5c2af8b91acf976a477b0248c476124ea08..18af8caf310e80ce82b3a17e21addd77f78fe974 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 77ef5441f6fb6f8d4d24ebd7d5e5967370bfef8c..2a7a0eabda939e4eeaa0aebacf358a71e09e787f 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 7916f28207accc9778c6eb36d6d1ad95e10924ef..67dde4f034c461dcb888ce883f284af208931011 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 4deef8c3976989cf6e644342a34645c592bd6b89..d62d23ffd832fa160862f250d4eb8e1c68fc11a3 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 e10658137da3ae541f8f1b3395baded6c5b9f3e4..37e1cbc190c57831dcbceff2fbfef65039952e85 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 4aa37cd7016f5d83c218d0964473c7f3a165bdc6..c6c0bec1371880336d94a9ccaa71815a5efaef1a 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 5fc650277ab0cf0eeba185ac8c15bed90918da82..25f2ba23b9e1ade0b9456f3c6974351c30783a1e 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 87d956141e2b4773a11bdb90c781f3b8865556be..1c58ee2c4111bf4d5713b7faa4823210871dabbb 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 ac225a7f84d1f7d69d00df5bf74780df8be92781..52bd3038691505591a2d8940719baf876bf4598e 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 036e89641fed290c77bdf14899b4036efbe1da37..46c82e7caa3b6582a05211875c8bff2ecde5c5d6 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 03c7af3f2ff04fad29ba617dee5b1b8102ae9fa2..9bb45730ca25500bfb3eb1fd0d34b5262065879b 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 b80e49db756b547a55b7ff67f19f46399bde6ce1..7937b703ee455716b66fb7ef389532550798b336 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 fb465d87bb686e6569574778bb5bc1c459f3d772..7589e8160d0964c53daa1303fb46644f5e2fdb65 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 613ea24a9ecbd64ac82bd4baa8e326d941a5b749..fccde07a0e28b04823004884711ead0aaab015f1 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 6f70e4767f4d3ecbe407377bd0410b28175bc3aa..a2b172b0898d67f33d4604a74a820b850a18b71f 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 5922643004aea05eb985663ba932437a1953e9cb..f0ac1498ceaaedbf1e17532f68489fb0f38bb154 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 3a9e932e9f415b56763646c3c1ecd438c420cf08..0a12a05156576fd883fd5447cfb995a1fc262fb5 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 89ffaaa74c3de7c1c7dd422d3239e17fd5593465..ce0fde86248cf4126ed38284f7000102a0e23fe7 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 31666c8fdd1d96edd4e013481dabc311eaa2dcbc..9d3739ce7895637dca0915b427845429a067ed79 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 1c9f74c40bbc83f25802f82cd8cfdb13f099eb92..331329cb5c8bdf0015e3ab1e69e7bd30ef4fca43 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 106e65b28bbebd07e599ad4eb1dfe766292bfe33..c3a11efb80c24bca20151450e8826982f968bca1 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 5d15bda8d41867012e7b4edc20a3fb331b41dbff..3a42463a0f95959beefb258af6540b7f057d4a56 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 8cea034e7f5a9fe0208e27860e73185f89c5de79..b3c475ccb0220bee7b124a7cec9571d16ad38d77 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 40a85143e918ff2f145402d0aef80c10751369c5..977542261d9034a505c8327454b2b0751e75cea3 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 da047cd7ece231d2f202e2fcfdf6775aea34e134..97b1a66f47a9cff0693cdbfbe501280e3a645766 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 90eb62237e7829b8bc7206a29768cc4b1ad7869e..07b98b9699120c254a62f2b454c860f4ac6d2dd2 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 23bf730305d0035be07ea0fb99d5fa0254612085..f7621ab38fdaa0c5d5470835404bc7d0a11a940b 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 22a522f318b15a21a02247f0b5db73dfa4a30f95..4a23f97893ba9334336da8a510f9d0828c1e6bb9 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 1e1c06a48cdfedef69f448d0775ed4e81c54c8c6..79a59243d2ec9ee535641eac0bbb7d3fc0b8fbbe 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 f5d6e08ed340b1f26d9dcd2675697264688094cf..32cf95bf0674ca49ffbfbc1de8dbc1264bbacbde 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 95b25f4b60472cbd85482d13f2d13ce0d78b0056..6ebdef0bfeae6ce31fc68f071db5879b6752e242 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 1ad8e3f4e29d26fa1b727b7cc9d71f6901177be5..70180c279204f3f6cb9ea3d1deefc36f91dcf543 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 94ade0a0ab182ac38b21c509f0f2eeadc2dff88d..0273d22471b6928c99be03201d1116fbf8fc37b4 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 61836e81a25681002cab24a8ef1ae61be2d05016..2b4210dfe6a7a621a89967186325c1ea02e1af20 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 deba177f2cdd2a57a3b60f7c9bc39ad4f7605db8..f230f8c643a9c1636fa73ecb50b608294d795b40 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 3e747550a9b32ce771d5dfab89a5375506f2c7e7..0beec4a804449bd20028a397f6904b690d248e54 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 6a3ec2c388abbc6c28b1809b79764209ee8924b3..39809b7f00dceb1b54aa978c6d026e24d73de27a 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 4fc02458f8cf9097a7f2954edaf16543ff3c3976..1a65532cfea9499aa0a9ca2d4ff02f147f643824 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 f37c34fd5b21c3356da6e0934a2e440cfae47e90..33c665efe0b9ac1ea97db004c18579d193c4cc12 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 e4cc92760b4a5d43aa1f0a6c7d89ad669e9925e2..fa0bd640b0bdbd6db7ce6fe3b65ce80fc33af5f0 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 610310cc69affa6a8f63653d58ae2fbee358a4a3..ec3b4762f884fdb2ee8225b7a8de7aef6195c503 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 2d91b59a14e85e0ab48c53d07e75a9c81609953b..67d3cf8d713028a882d71533720f4bdf08f5580e 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 f9ba6d118acab98f0201628c36b17ed746755ac8..6c86dcb5d8eee07d881b63debff7a639bad6b73a 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 b2c1e9f791e68d643d14f1cabf0fd3af2b784e39..ebac35b67b81245d7535620e55e132c8b87d3109 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 cfe72d21844c15a32f6768bf3430afdcde5f1a35..9baa852bf17f43f389d6767bc92c7e8e2abeff68 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 d4ca7d63056079b362aa8d44d2596f4a449010a3..36087756f1010ab8b487c17a8bed33e3a6d8542a 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 1877f638b095a8e6d48d2b6757e405dcb0d4b622..793764c29d5b74bfeeafc05b12231ff2f54d7845 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 64fa2b057ea450435ab9fbe7825fc8f7d1c2b688..b34c979b4624cfc778148931e8820a4a6692894c 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 3a5aaaf1e030af2e5fd1589f334f287bd8671a01..eb1a9c5889130b9984c98ab5e277689b84a3049f 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 67b9d09519561ee282070ce13df15ae060efa89c..d0899446956e3c3b0eae5984b436d342c80f012a 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 2e16e3555f58ce50d38148f75e1e3bb2c6673d49..5a8fe2f149c8810344fdfa9ee8be031107216c43 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 99ad6a4f845a017ebe267632e0ed776f9cc3e24d..cecc7a384a0aede33580099807ab7d471f7a3f8b 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 89adb4396eaad00aeb607c75374a2bd676d1e66b..a084d0729b9e35fa402096812f55e6b36302d21c 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 13115e3dcf4a82fdbb53bcdbaefc09b69cd398e6..16a9b457791bb06f93ed4c95d16de32a0d628725 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 8328e239a3078ca883a2c112d47b0e449d4e3f5e..71653787e5c1a7091467245c6dca368ae701db35 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 66e8994439c9f6ca9914b5ca85bd4cb8ddd19746..e5848dbf0d7d6131ee1d085b816af5ce6879174e 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 3721240ff3f88aee98b5dbb20d1cfc64ceb97e1e..fddd9470207baa3b3e5fb758e5f70489f5144dd0 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 2981815b69b0ae5d5ea57935e34904cf7eebd731..53ac8d68bdd0399d6adf4dafc5425f16ada92b1e 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 7256fa571ba8102f7569a84ba362d04734ca10b4..81ffea989dfc54763fbbc2d8fa9546bca2206e73 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 9caac5b77d8255bb43cbaa009bbf3d33287e838b..e5bc64ed065785514a1651bb6b4990f0b316400d 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 5a807f7f53a7b1cdcfdddaa605f0c7c61b6d5d79..7227e075fe56f9a7edc5addd6d6d22d2fc4ae7f0 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 e4d9a8f9449471e1069d894c66efc9d9d31e10fa..32a56504d99dcebb30345aaf92a84336673f9f51 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 5723a687f70b35fbaa77390017c19bf127579684..be7425d7743a73c9736bc8d954ae1e7194e0c9f6 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 d7bc7d53f2c68d7a852d5773e73fde081a5a40c4..77ecbd16e95cc404ed544f0b07f3347d04bad017 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 3a4f71a88d2c450092b98add126d5f52e4792e0b..a16cd592bbc2743f67b3fc30a5c2f81183a7fff8 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 0b1b021afa61f686c04c595eb21f909e37f08512..21ab706397b16dbcdcdee058f2d33e567e29b4da 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 76e2d94080961efdf924b4c15b5097b37735ccc4..eb3eed55da26ff99d9ce36bdabec601ca9f8d4c2 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 e91e073b5cc124f1882c707096357acf1cbfee90..d366143a7238acd3650749f65ac432c1f1abbc10 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 5dcea1c98b470614c5213b8fe554738c86783946..77babdf5071840ea7fbf93025cd97fc2c7f16e07 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 a034f1b674dfe078d2e40bc50183bf17161b8d8d..cf5ebb445760f1669e4c064a1bb3e783adbcad90 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 ce601d6ae26f9b81f6caea24e5c26cd04f43efb6..5d007afebca279cafa0902d66ccc2bf83b0ff3be 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 18bfec4c950074d9bc9ba6d94112505503d4e958..2910773fa32896ea92c931c5dc27191bd62c724a 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 b8468d1c88ebfee1e241aac0bc9d99628136982f..99e0275b0aa7475f7b8a993645f952a6acdd8432 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 281c043ae096bfce717ee7b064cf370d701af8ee..14d81060ce27f3d84c2753e4a50c39b6bf897f41 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 7e09a161415be28275cc02ae8e9f7d41d12a9f13..b20c679c79af275635e7b5b5cfff89aa9bf4b0e4 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 712ea145aa86edbe9a7cba001ba92935412b5f19..2a3bec4689a197dafe5d0081e53a5589e48477eb 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 5d9570d9db00179acd45e128edff1acdc9fa12f2..899defff4c53ae3aa6fef562dfaa4a4848bbec2a 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 05de8bd362ad869c0ce2cc7eaa12e13edae97d47..4c736e55d3326d1eca4331537fc22e345a02522c 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 8a27c262053e7e324989035c4bf917706ff379c1..3431ff08aaca80f20cf4d9de8dc0dbb491385e43 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 84970a8cedd14c27d36863a8f295c149befb33bd..613aea78d8c0c2c44b36f878e1f538d201002950 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 d14ecac3bd4e72b3d4dd15844530290bde6af324..5a34d9c14f9f80ccbee97495d52e1e8aaec6c3cc 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 5510935a1da758a86bf05125dda9ea5a508a96c8..5526310ada0efc9c0964f538fa67b5b16ab1fb1d 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 0be43110ceb56c813db6f4ca24304fc9d8f32602..ff9dbd1b9a5932de35057a9515de7ebc8e059cee 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 1b13541534df30e13b36dcbd11aa89dc7aa0a30e..77803b42676fa6fb20cb107940f7f400cec85fbb 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 af35acb71de4add644aa50f3516371d73d173c74..0b36ffa1905feb64923a2323558fe9b52eca1e72 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 3bef0dfede4dac9ae542a2eaa05eaa30879197d8..e86c4f2f17082aa44eaac8d3321ceab876124966 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 33a1a8106645bb39602c6f863f59d1dba5f8cc84..0252a75645bf2ac2ea655cc17551ffc11ccdf3e0 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 5f8a9ebee38a6490df0763ba5daeab5bcbb146b8..803d3ff31dea9c185b3099ae3dfb107e7fdf0c3f 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 14c5bab44e29b981bb60bec70fa5830e33b66259..f7fa7862e11843d96fdadf110dd3d8800883c736 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 db366eadc48e0d063485f18a67e5ea36e2c2d49c..8835b1232d580ea56f356ee728ac5d1d94289b86 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 b6cd94e5d456ed2804f58d1fee4251fe720e84f9..2ab88df3aba4bd0ad0abf90ccb0538f196a572d6 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 fd0d0cf60ea331c8d64ad25ddb03b71304396c9a..02d971bf686f938150d43e917093649c8fc30ea6 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 205e79dfe4f73256affaf0db713dee06e53a872d..d1a10073ce019aac6db0521b0bf227126bbc1c67 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 24ec996acd494c1782ffa93fbe4bc9df2683ad29..420f4aec9f2a7d42de4244f5baa692fac28ab3c9 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 5daa7260c7730fed5f551e4451849555a3ef1d74..4b15a8a7e83c5093531d4f4d210f8366c9089be6 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 6ca2bfaa2a731d47d6ecd2d4d79e58a00c8c05a2..76219d348e4ef1a4bd5062d0c96d9c0be85e329e 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 413de6040338e1186b993b405baad2d21c8c9bb0..8c77cdba3f47de1a4cdd7e123e8c505b50447fc4 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 f51cbd7208cbc62f02e89b542cef72ead9fefe03..6587e1d3699ff5545311e61d05c71c5b7992251e 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 3393084d4cd3d49156256643b3b50d112fe911a4..ecc436f7bb0d772729ee952c0f8ca267ef00d8ec 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 1af940ff4dc158028ad33cf9082ca2d67ed37eec..423fc6aa2696616b0ff4672253118b35cfcadd62 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 ad7371a4db6ae3cf1e81180e788b4d116f07bc29..8658230ff175ab667fddfe971cf1fa784a3ceaa0 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 f9475a7ce88ce3216a61c9bec3ac97301fb0dfe5..3da6b8188361df12bbc983789068ef35a9930925 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 c171b5680dfb5d83694e4eda4ff09278d250dab8..3f4a492c163c9d2b01cf4873c74e661b81b095d0 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 50471a0d94f43b9ca6bff6ed54eb60b532ce0b7b..2625d2e9631d4d53e6b893aa6f290d0001b289af 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 e0ba2b8066a3c71de402d60698b88fa253384828..840789efc67b5e19fc8538784df83c13678c4aec 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 4261e9959787d4142309bf0f79335207f9097bf1..476a689d14c761d8f001265eb7df1f256ecc473b 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 fb97042edfe4b7a20fc12da5a42ad653768baa27..8a17ec730c53eb918c75cb2e8647d2419f3d9c32 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 16ca068b833b73dd4db5d400e0cffb7117fec2b6..c1f955beb6645cd900e994d22a3a62a17a6533aa 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 2f574b8d9ea53f64b5ceb5b80eff445ca9111d5d..ce8bac3963e39c45562ea0e3b8e57108cecd389d 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 1556ab5e52411e78b8a67e1ed603f6b735b25ef1..bae1fc9dc01b5962b04e367ad4841c74a238ed84 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 e0329b400980fee2c4881ff10af6ac9d76f2b1f1..f603ade1ed44892873b9b40d3c553945afc1606b 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 a3f043963cd25fd075cf3659767d3cb7160b54c8..94029772429ff35f41eba97e8270d27dc4a246a4 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 856570188551cff57bb37fc3ea29736f4ae167b8..4330283b919fa204ef5629246d91f9805f3d9a6b 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 f0ab928173f1a20089c19cd5117b53f7a012d652..59aecd0d517de45995cc42c2356894033ef37125 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 daa4332c6aeb4fc3b090f54b5374493abdabc8ae..e5e2693bf08e423f1df64765d2309570e31800c7 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 b4aa483d9fd8b046dabd3c9e83bc15032fb6b669..1d76d24f9b5dc40f81ec2720b58314ef0bbec4f1 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 eeb970d067dd2f615a5fa738f18ba78190f40a7f..aedfc1e42dae83d257269c8add6c9c366ae7997c 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 00936268774e048ad9643e63e4adef86410a91ae..2dafc2e143a216f94f64464ed584353c7942b93d 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 0443ad4c9d1e1b36295537eb6b582668bb7c0b20..b8e15dd232dc8fd0eabe70db4d9c20506de73741 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 0a17346c016c3527a821eeb106c09e0d98d42f3e..3f17fb321cc2f7629db36264d50658c080e850ae 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 a7c5c79a48d627b1147193913a5a113acb027e62..8b2bad38140c6558f6a149f7cd07004ff6d0e754 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 52842c0af122b5e71ef205468e9f57f4942faa92..59ff9b15b5dbb51e17c19e0406f56edb0f02a90d 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 523e9a337ddd0ce860c43972c7ccc0b5306427c1..1cec1e244d41d06433f646014b17f1af66e8b082 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 97e6fcac78518ee4412523bb08ff13ae1c0642b3..078a45932e17e8b3b72fd63b11d6af2d434eed56 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 52e96c8fe3dd29936fb7ba5f7e93d9be8e6e8be6..628edec1db9514254580afd49bd943758c961263 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 70ad4b6ee2d263293b75b832462e0df4ffbd4676..854f355dec54c63cbd76ce25090a687d42ac25bc 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 f6e5ef40f6c240bcf4183ff6fcf107d9b01d77cc..d11c1d77665e36fc655c11e16b21d7e46d0a030e 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 f0fe3437ab919a7132a72809b9ce7ccff0ebf01c..8a3b4b2a79c8c6d3157a12d519d466101b22a1d5 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 de8c75539b13bb73d76a933e3af884320d05d62c..cd05beb812e9555e782c9ad8e6f111a77f4283c6 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 42f863004edc22d38716b335a5837704d74e2b11..a014771968ad6b36f3b208bce19517d452af2cd7 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 7f7e0b4849273d44e5f599fae66e490957a1d4d9..79ff57f60826be0a309a035ceeccb37abded52ce 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 623e01733bc835ef26f0675656041bf136ac7c16..f31251260450cbd232b0a08538e11a482fa76431 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 156a784b498edd59d4804e92ecccfbabb73f8155..aa8b394f0336b6d80bf897be98e4d8aee9e2fea6 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 d6e235f827320d17c8c5380bc93010bdfa01290c..120fa26f0b314729990d97563b47141e7fed634d 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 d10dcbe16bc9eff7b7aaa76b7c8a56cfb8318184..8dab50e6d54e76afda1b0291cc9b996380ef8949 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 0a24b9a7def25dce2853e5c2acd7b4f5dd248b42..113ba742fd36fd94a30194e043bcd21ac1c14ea8 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 686ac554d930ffe3ab0d806b8b0e0661ab207174..1fd5563162526850ec0d3531a38fe984c1530df9 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 f63f2d5e5d0eca87133c200f797318c8d937e4fb..80aadf5269c54b7fbe6bdb6bae86998239acdf34 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 5d642e1742226e42933c6866a7fb19f01b1af85e..ffae88c2ff82e692f0fee58a754afd6ccbc239bb 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 e9f60db7eb2e4cdbe4314e30d725796502b6aaa4..36f3c338b85a7214baa7b6c7ab881edd13bcf35b 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 7a4d6dd8a34b29d0a77aae091abd0c4a04503bac..2a9c77fd0430086699f82a0bde1eb65d48146037 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 64a88b72ca002e9e491ae4aa5f40132dd44c9f66..361b75a66149ef99718bef6e30a2244dd463f77f 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 f7a88e4b1fb3811201c32e2813e37c696ff2b350..b1af5fa9a50852792eaa8dbe41ffc9ec464d8e8f 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 6d9d92abd58ca4e03a0f78333514acd0bbb841d0..e4613d261f817ff00f7da349d6ca71f42721bfe5 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 8706b8c95164f3a2b28c0542c807ba4e47941cfe..6cb5921bc23312f6eb0376dbf65ab59152215404 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 edf1ae1cddb5f1e5305ef7c3115e9cd490dbd70b..a7331e1c89148379aa3a2a65f1bf112abb7be1c7 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 a4574f1dbb0af8aab7ce9b8f9129d26c966a03af..b1be2b1de9829ebb5d2aae8c3b53c6c9d6867f85 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 154ab4522bedee43ec246a7cc2417f189d641410..27fdff98c7516ce8cc70f9a4252fe6ccd0c0ff63 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 8928a578c351f09215d9efa737cf6d1bafcf9782..81ffd181e44250a29dd3943f1f6f9a87afcd06ee 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 0182b8be8eccf5ef6650a2678ac9e8b7ac43d4f1..b4224a07001a3aee6f46b2984f6b041bc1fdfe48 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 b844c11e93e79e59bd6a31a2d5ed78b6c21a8d77..7e5e39b4a531600d79cf1362035b251acc942f9f 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 dc4c0961a947a3d2ecab8102853bfe2d5a6c139a..f3f5291ac5ef44e717261dccc106c523de8da7dd 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 db916ad9551af221db471014e437fffe8aedd52d..04f125541560043a115bdfd40c0d606ab077d5b1 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 fcf60dfcaec82665011ee057ce30982e6d25ed51..78b202961ae8d7b3f15218e6817f97111086ae69 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,
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 20d83e131dedba7baaa0d56213a4a41703ddeb2c..4d33f00b75e585dd925979cc567c58c9a524e712 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 e57a88dd9f3ffabb1212ca640b624df3938bb5c0..02619c6fc1d56b1396f29e283a578c3ff83a8bdf 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 216462bf80429c2c8e8fe6f4bc187bc800250a16..72c220ab8a2105fd1250fb1182d7b56c4446effa 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 0a738e69de4ec2d1c2f09a7c4d1f672872f62781..adec85bc265498687b8726a4f50bb510c5ac26da 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 5d12ee7e93ad8800bb57647dbe47b980dd151aa6..97d26b6f36ac0f7a2c174881f3a2ba57aa8d4119 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 a8898fbb1409fd86c8f2020c2295314037c6f1f0..624497bc65c56cf3958cd3c71ab546fb3d662cef 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 9b6a4b804de16e9642a63ea7f5123248184b6641..cdcc5dbbbfed88c2977d74667e82bd19f6662936 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 437698e4f35c25060d9e4db161b62355b89f0add..1f60298424d0c021a64766d05f6590cb6cf7b5b4 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 1c974aa38b363940100bc44dfeeae5318e7d0c26..33d67562f340c0af49fa4e26baadf45c4bf660ea 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 cdf697cb68d7dbac5b8733e5a5d4f6f20f0e7441..477051bb208c4f4ab2b0238d399d1c3237aeb78f 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 b839bc2ba02e32bdd1fcc0a636773d2d2d0289ea..aff44e3a4c945a6eec40bba2b5d9b7c3c40e2617 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 91b4d411d681346bc2acc4e53646e9b1d1da1aa6..203691f4d4574def3296dffa0be81a720c7e4ce3 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 f4fffc9e1ab21243be9b4f8aa1f7e01cfde56d62..7cdc228a1abbda430a53e5bf0a74c4d5ab178653 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 e7cdebfb00a6f4e73419441d16a5cf271c11849c..4aff0a2c7fadcff87a76216aa9e03368b8638aac 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 d0ac77d7aa6b3abab0f7b2ba1f5d4c2c7ad701d2..879b1ec523fcc1bbff218aa66ee51842d51e3567 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 e507ef9be6f15c5ff2d718f223e76b66748f8f98..d74403be952f0c5c6712962e209124dfd5119229 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 19f57c848a59720f06c7d850aa319e62caaf1898..fa67ba70f58a4ca28c3988407a44ebe7b543a6f7 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 cf9968f1067d51323bacdeb0c0e658d106818741..cda4b55174fd43b5bc954d2fa5df87a18d653ad2 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 217f4fabaa555d45329dbe2d2598c3fd8807117c..ec672fc6bdb34992d5837ccc727c468cf47fe9d2 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 83cd96f3a534c6fd59deff01584ccb9fcf5d582f..e56fa4903238c05e1f6ac950f1ed35aff4257abd 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 53d2cfdbaca75f70ce6b68f0b2488100b2607a01..7770862003950456d443b887a8c03275d716474c 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 5ddb98b6a1575af4449c295e4c95b82596561b9d..042ac6c9b8b6fce989722a0318aad5d9fb0663ef 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 76446f8fa3b965f4df9183071fbfc8d20006dbe6..6cb3f457868de464b22c058b9e50bbde12cb6419 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 c537e99362a1855150891f4e23d8b0e95eab1b4d..2f2d16900401ca1aa05a80f9379e7af029c120ad 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 0bd4d5622bf3db35d4334848a089b33e27c485d0..ae68da9cc5735983fd3109ccf90570530e8fb37b 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 e06142ab32c6d2972749049f685ef2441c666548..c29958e619e74504b1be8612bab7e5c9c0a990cb 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 8914724f7a5e0405fc8332d1a22a09de8e45508f..e377145b83018d26e21681a40b78f4cdf7bec607 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 e8a26048aea359d61b48838be8338df0fd14d465..537fa1a0924326908c4ee469718ed3d05bd5516c 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 52505ddb655b9ee35b213fcfd9103a2797a6e372..8205d18210c1c929643c43c0c966774c343d93e5 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 2038ab913d90fd2032f02ab3c704779aa05e5ded..b55c872e9b3a2a82984b169babb88367221d0e63 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 264fe40c6efe610560c78ef4a0247169819a4f79..a088e7fe2569509c4cc38fb15a733a9be91bdc59 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 012cb5f918ec477b7dfae9958ca657d0642a2ef0..9faa1fb3e53a0004157ccdd16f4fd8e4e5bb080f 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 bb2067e255f20db0f1b10395e7ea0f25024445f1..b686b99819c608c71eef7fbaa0e680f04b71a1f3 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 fc9d562667a786a61b0aa591f61fd4f4d2d9e583..fe809b612200b17721ff0d111d22c11c93c4508a 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 6c5d7dd64387afb6012379f4a83bc24cf4796ce4..2d816e20858a00140da433c255349786d1c6e9ac 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 bbf0dc452d4b1a408c4d52e1774ca123cde734eb..e946f15ec23e3a347e7a3f53f74c126a47906ab0 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 cc439c87dc92b8f2d30fb5e00e819cc81f91e157..81cce7370d05bcda41dbb3ac126cb481d78c6eac 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 0ce5597319fb7fafbfff0710f68c06b329f4cdd4..179996961603d053bf1acdc917acafef185bae6f 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 bd6e9e706ab109691118666b51dac2eb8f07eb13..84bc65f4ecb718ac22e28969aa18bac90ae0f8a1 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 d6d2818391ca57339eeba2f823ab3c841d3074e7..d49745911a290cc52004967d0dd010937c3c0d77 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 2adffda54d34b7b6da57c2e7d95364fb7014a820..05a701eac83798b716c310c709b964d1de04a58d 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 8c5a40f971a53f5b6a2586fdd19200167b338205..f261d078877825f911cd0515530f23056be9f830 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 aa7d7ac7680174e1cccb2fc92222392408414c7f..2e25630cd6fd9557c1b75b90441b181002e10468 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 b2d88443e21aa3e117b9c3009f617224a39904f6..a01abbc11ba0022a4a9bc83d90270ed23de24d47 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 e5f672b8b918586e845deb928cf4fb51fa0dfc8b..ce38b2cda027514566ec44fc229c18288de774ed 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 4a8d5eb93b9a5c55503419f6823c5ba5f6a77299..0296a07e9cb775a164a850ee931617da1763c6de 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 db9677ab9017de36f839db005000599e93c5fbae..bb2263c7b959b1129e2506ab62c96312e059898a 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 8a60922931b5b80ab460e4f4968d23eb6dbdbd2f..975bd7971d9e745819e6f19bd4aac53dc5444ab3 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 78f07f0b184cb54bfaa34296534c43f865a494e4..1eb9ac68765f7f1a4c97f9c87713a610d3904659 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 15481b3bbeaf5c30144c290363c77cb53c52f153..6482d092436a95373b5686e33d01a8f33759718a 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 53b0d6e5c55e7719a9537747575145696ccd95b1..760d3284c7af4f879f0cc7150272d060470a5328 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 013fedc81421133b54bfa52e6c07d3dcf51b9423..8530c50229472e7f774a36cbcdd8bcaa2ad10931 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 95d315ca852d1aed11002419b829f76fc3f2cf56..d29869a51637e947b709bea94b6c0c561d38ace3 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 ecaeca61c674453400eab6a29faf336e0b523c7d..136ee5c9dbd9c6b37647d8b684a157d9b17eefbd 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 95fc2a829c9a559e2527f5b42a118928b9ef0606..06dc85572b7a505013da29b1a4adb88c798db3ee 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 218c779c1b0af085261659b3e0dccbd3ea16638b..f9eedde050d97344451403be8276e084255440b2 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 d3268392b6d56dfe298255dca7b1716344ad3423..84ce0b45efea9bb2b5f1e582db45d252370ba1ab 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 40c03c8112f130c54e6e5667d30d7bf4d2951dbe..1afab0aefe051661944b4b7f22c66a2ff7064a6f 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 e950e9708f66d509dc0c4c955c9687f66202bf97..6a27f20db59098b4f1da9429ae64056c60eab74c 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 644e89c61a72fe73035cc0e9af0311e92b13fb52..acee8ee13682518ab43d53f8daf1a2db91cba13f 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 17322ea8433d1a2e67a587d4eb8dbcf3d8053033..88a31c67887f568296b95f54c12bf019be528717 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 bb34dd42ca9553c06865b1b7c69bc7a9156fdcea..a0c04daae6012bacb016994d65231991e2bf4679 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 9b82475bdfc1ec8a53982623c81ad5d85e60839d..6cf583951a7612f42d36ace9c275474f4a24e853 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 4e6f401a3adf7360768606f61cd1632b9fbb0344..1024f1e422ddc74f3572f66c90abc7ca2f3dbceb 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 ae2d51da5ad44307db6c489255e03de8f1dde996..5dee02fb78ebd2f29cb013f2babfc124fb65e9c4 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 84a3df9e127575500034d7fc02760c8dce67cb90..d097932110a5f2a8b5507d9c7da64373be1bb4c8 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 b07b85987cf48987a457828790666d71705f1918..b44f69ccb9f93752ab96fcd469b12508446735a3 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 ed4ff9c2a88418e05cdc04f4f8453e401aad6e86..2e1932f16c3fb706d098f64a6b58cf78f8763f80 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 89c58d1533bb03ac73ce567abfd36a87969c0436..ea0c4bea0bd0136bdf15fac834e84f1df088bf75 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 39335aa29712e08d952f79835d042263f2ab721c..564479ce20477ec04b1bcb35bb89c60ae92dc56e 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 3fe306ea93b9b36e378c8447481924249b459d0b..031c0e37e5b2be8a652e7c49a75368503b06f9cd 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 969777ba34777b9386b86a7797e17c87f7e55ada..c4b812c94fd5e8b6dc18608ce73ed9e0ffa16847 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 4019f34388e83149a3a4fa39bdf375e282f52ce1..e40151d9643df16c34588cec152f6dc83082c88d 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 189b114e8a957da47883e6cd4d729fcd377304a1..818f503b97818abaad1c991ab874a27b189c2eae 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 e773cec2d79be049f42947da477c121d84a11862..39c68b996146fa59eabeb58bbccb53740bb3aea7 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 238419ce405f31cdd9981dc9318109eba5e407e9..a9ac7dc76a9394bef446090d5434f8866712bb11 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 989f6c76288d38600d4896af56327eda31c01631..9b94723d906ce068873d4cfe18c054b19f5b0f30 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 5a405397f75447e4aee659900901158cfac0bf45..f587342feadba7d2aff0db5276f40c661e130e5b 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 af0599095ff4d284724f43ecf4c63ebffe362e1c..02e84efc9520d9f0f28240802fcab692ccb1950f 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 b08c3a4221134cfbc16320fb58e3f52edfddc46c..439a21ddaebc79afcc8b5ffc64bb141b9339008e 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 2d557a1f9517b10e296deab1cfd89efc2594e048..ef8b5bdead5ad5fc68112d981acd6c9f9bd81ea7 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 3ab10f9e7f85de09b1fa538bc35639b9519b9d9d..d968119477beb73f859c05bde105267ab10280e0 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 a09cb9b28ac9a5113cdb566507cbd9fee698701b..e318a34320f0cf06a26f3de25cdc2ed2c1cbbac7 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 0cef2ea0521e61bec0a2e2d96fe8d048f241fcbe..ed241186e5042e0ce65671cefe6ed296c8ef6a30 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 f691cf83893fe645cc55b983c59e9a69e6b599d7..01448975bbce2b82407b25c821e6661257a34d08 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 61cb0efcc0bff49ca43fe565a62ace35b1afcefc..88d025853300c3bfc65d4a03bcc0f7b1646d9c9c 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 a5c664d4d0835bd7948abe52993b3f3b20489f43..5b5f66f50f68d6ad09af664a90bac1bb6440edf3 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 bae12d4c096f39159ef6b7f4eb3fda8da2c4f1fb..738403b6ecc391ceafcc1674d6c62fdb3e85f15e 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 856a47c91f406de26852df827976f9bb5d0d9da8..aabd5f067a9eb2b0d8f204920ad75d703f46bc5b 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 3d24758821b0dc62d4743f5985203d703102e111..0d684b624bcc23e4ab9f94d26b9558cec5087729 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 d9aa5c804db6f9026a0e3043c062266f4b9eab25..38f7b25121525ffd9191433a07e00e373694a3df 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 c50ddc3e7cabce2bf333986ff82e86965db7ac15..63d0f1d72a35c76adf3c29baeedd7a46f430e072 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 192214557787815094f27461933db1b9054987d5..ce81129c280a5d7d5d66f4ed2f02bbcb7b543e51 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 19720f679b0a19da0731d315cd9f960e6d06f61b..8f3f0a89ec1db1e138d5764f6229bcb65bc06911 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 9545de43a753cadcf8d7c2418ae2a7d1dedf524b..de0eaa2785e4ac30cd1601a7e6f01c41848e23d1 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 0fd4baba4f3a77ddd518afda18d9fd8eb37817be..32c74eaf2da7438f3c41e186ca50100def5eda51 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 02fb1dda4a3f35b60b5570923ed694abda16af7e..50cc7dd527d016e337b7de0554cfb7d1f159cd3f 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 5bc0b7309390e8f4d4f692291f1d21d9797d4775..d8e3fbc3fc3bb3fe433e703f0de950201b8593c2 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 a7aafe37057c5dc2a4875ac880ad2f7155d31d33..1f3c750132f4e14770acade5cf9494bc0d501769 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 43c4c1353114c4a1ddd9b73d7b602f430ce8d15a..f706aedccdcb8337e65208ba9a1a37c9fb7b267c 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 ed01f5fe8faeb2b7736d789e0906f8033b26338c..043da87e5d674289ce64065bddb4e238dd1162e1 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 af9e2ee11e1f19d04704bedd4ca14239512c409d..85340cf9bb2d93d5290c994d1c29c7b7682da306 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 96b1af6ee70a16e5908fc920f514e9ba539c5d08..45bbed07fe2174273d3b00c7dc2b75ce686a4855 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 95e2b063146bd635bdf37f440cb71bf82c5a60fb..45125bb39073bf880301dbe701abd12e10e01d40 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 316f022db8839f67481be92a544dd5616c4555f9..82d106bad3e1289282bd8696655c0809027422d4 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 2b7716bda30f5dd1921bcc032fdce1dcbce09853..d84808e1cecd3946ff53d3b70f49d3daf36463ec 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 de034d9aa7853b5c09be1e4b3cd2ed578a2d82c8..0c74b97a21be6d8c47a906de12bd2c8fefdb1342 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 9a8aa9eb0ae20738c12fcd9c8648795eb87ec3ea..7b8b0278d9dbcb32f9ed8a7240b2579be64460e6 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 5da8c07c4778d4a9480ab6628869ebfc4db5630b..6adc2115b6c76a36ec34ad31280ef3d0c0ba55b7 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 e662e2d7754eb1b826556f752b53b64f6d1b88d2..197ee129ab53a11f92207d16263e0a680825acc5 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 5c36be7339370d11653e54e957cc4b6686018482..352272e4b2ad2ff8073a9eadd16a1a3c4e2c532d 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 966db62c3709f13a551ad439c5f2286864f1e244..d218bd04cca8575d31fa1cac273daebb6420d6ba 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 d0024e879a9592b913436dcb5b1e0b67a647e522..ec6cca20a4aed4a7ac3f896df6187ddfa55004d3 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 4d9f02397bbc6dcd8185632a216f10d79543a38f..4b2e8356da467cd1eb1c1285d25251ef88e7d6c0 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 64fda588e0d914572ce133ab225eb8dae9be315c..74039bd77694783ec659e6bd3dbcc5cc849272ab 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 a5bddf2054f4cefbe9d68b806b1525fcfee9b77f..a22e9cb011f5787244f4978bd0ff3194591ad0bf 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 5508811b348e431a349b86c26b4545573285abd5..79bd0e4c7bcc94f7ec1696d0530e8b5d5c5f22b2 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 9ca53f0ad8b1ab1897036fec187fa56a43d6173f..be4f288f9e59ea25edd9f933e7e4f97b778a6f01 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 6c70e6e991c094b315acac4a5a173405a7376e7a..ae182ae1b889d7d0eccf8797081d8ed6064ce860 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 faf2ac3ae71e369329f1c5461406b39412ad64fd..bb7de96081c643d66e51bb2a905e54848f82a4e0 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 4fabb53e0da9bae6045a1559b62a8c51e9aca67c..4fd9a6421e2180ca18633d9176a9c7f66e5034c2 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 253e97821ff954ce7f5ac377dd8e14c170f7f9d1..e59c051f0cfd61ab51434db82f2f1e67ccd22b1e 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 c550f890b861aa56a37e57572a7695bae0ac246e..90c93383d76b9b5323cedc9c1cd035a3f2dad6f5 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 b5f52bcc31fd00548eeb4b8c464af192291d24b0..b5e7b237e16435ca643356e50d6c50bbc8eddacf 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 ca10084a9433b514d588c790d71ac727a5a80929..2c2861bff0cf56ec7af6a1fad9dda474ed99a8d3 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 b460db281886dbdc5c226186328ce11e44e86b22..ef7a9f000911daf3b66876544bd585a2d0a7da17 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 78f403c51f0c42e47d447a632cf4a0641ec28afd..142487f20c48b2a1e1fc943546e78d6577a641c6 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 70b1b2cabc2a5d44a1846f2154f59e3a8004d9a6..31d9a113fcce12545827f8026f28cf6568925b82 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 d145f72533b2f68f99a0bc13fc5293af74e608dc..1e260939f06ace8e08d5daf1dd4004d96fd9d1bb 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 c078660d1cead54dcdb01d82d22b1cd1b91c806a..24db815d48a1c9b81e6251b49e1001cd5d8dc8a8 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 8e27a6992ec6d2b0e639db63a56944b0b132d32c..fe8697a563cee52b578861a7e836a2d4e3d4a49c 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 7a64670e9f8c5b32494479f7ad1e591b14e79556..ea1fcd87e30c8139c77bab710d155163bd8d11c7 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 55545861da33ab54ae0adc8ef21d8d1e7785e3d6..fbc19d52af7cb529fc3f518c6993567c3d6cd972 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 aa0a883e81192473b0bd7cb4e63a6e466337e8c4..338dc0a43b554513fbd51a851ab30eada9c9ba55 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 7d5df00d756320188a2a9d4323c245f9f3f8bd94..8edf60fc76bc7eecac5110f17230c42db7ef24e0 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 a17e6840a8b452e79b637aa68d851dd5ae74189d..7be02accc4ad57330da9828fd21360657e15d69d 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 ff7f497c512dac61cfee71a5efda7c1e99d84f60..ac1cc46b316d091185ca777c993843ac9766242a 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 4c3544a0556f8e04819cdedbb044d5e04154f109..1e335ca9924a4077b0b86b8a7e8e703a6988abab 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 78cd2608894d73ef159bd32ea071adfa008eb3de..ca8926f8e806208dd19fbeb221b2185bed3e71a7 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 4b6789dc122ae2b3a4fcb36769cfe75a00eea13f..b8068a015242720158c30b653900bde6d5cd23c5 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 09cc8952957862f651809e5775087af2bf2ab628..3948483972c98a858acfeb5666dfd1b94a92db47 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 5a0b1a3ec9a3fa9f969cc1ed02686f6b704ebfee..a3e470ef3dd3a6e6d89cc1f24667b9cfb0289d52 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 7cb4700bb460d741f738dd4a4d23ad3e414f2cb0..d29244c7e87d67eec10c14e942275b82c613f6cf 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 2c409c86991493fd0d71f2edae937128eaf42537..383c54b602577744a80781ecafd1950e98e3cec1 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 b55adee870923fd3a3392e4d19026b0f4809ae7c..4afa9a209ec61e67183bc6517a01768ab9c2f24e 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 506f3a14e1f031ab6298807d2a8f3cd16c2ba5ef..f3d4ee39cee103e0d7b8dcaac3d45a687aa012b1 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 ea58aa187b160842b8b986f338cddf76ffbcee17..e9d16752cf85e0f513f749b6f68f01cc3dc3694d 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 348f50a20d6d265e2e677650d3eca7a1ecdd6e57..1e146c1d4f359ce5e354a19aed1fefb5c39b91db 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 e23e521edcb83e36a942f20990cd361ca3937237..a576bfc86ceef60989939d486550abc142ecae32 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 bae512714b0ae0c5c8c504dce91b41d23043219b..6b9dbc35d171f468bb9a98eb23756249267afac7 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 90f4a579615283270318f8043539ad04b98d745c..f2171093370a6c881754c16ebc6f136306eb2647 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 18750bdb163696186dc22e0ddb53d4baa15a77c3..7773ea41a4c048a37e90d9454d82924554df494d 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 33ee536260d0f84ffd20f54fc517bb28671d8636..1982dd5278dd9fb005d20faa75681597b45fbbaa 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 a034c1401b92e48a228d64ef438f5b216f9d64ab..a77886378a2e8d26911ec5b01725236d11d626f3 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 53e06ab4baad85b448119fec8fc633acc3f83dbb..60722a9f773f4c1e45a1c733384505fdcbc30f3f 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 62d044390fdc3cc2df1b8383e4742d30f32a0fa6..34a08da72715c7b4f8eb5e5dc83dbe0a813578f9 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 bc55f9f24dab5ccfeba500e45ae2815f2e6d345f..055c4e50ac4bb922b33f3810a62519bec8946483 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 c3062e16b8c05248d9076e2d07dec38bd8a3f34e..21e4ccede2a9f70e59e7ce8f459c9a8d2c8bc3f1 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 6d5cc7d10ac7277ca85da3a0937bf1751c119b64..62b3ecff0115f78254d25ebe2b46f8720a04635a 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 84651978881733ad5bbc92a164d0793d0e20eb72..2ad91b0bea8f81a417c2006defa3cffe87a3b561 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 3dd80248d82fec0225a13df7be4bfca78c1c4449..2386fb7019c98e42e77a659aee3ccd4d0181d15b 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 adf0db894522c84ce5ea19b08314e859270454e8..d7042022e026df4e863b7213c114733fe3ce4edd 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 abc567abc7cad462cc45e49f512198f60f1c6502..65bbbe7d3ba497fdfb58bebd3eb79694191955dc 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 91b5f77ff359548dec282c6c7ee2b2f0bee2f490..b204371e05267b13ca9e528ff20a22fb33c48fcf 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 b6eb4e0fa0195e33e8478995533deb6c00442cb3..91aff8716f5a8635316e71559f7c9ce3ba33aad5 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 4732c6d1088f7c818d614dee7f5f3aafe91090e3..04c301f48a99ad67b1b69a90942bb77e57df8b56 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 ed099170043e3107b5b9f41a27e757f4efb0d458..5aa560fd0bd28e8be92d1cb7445df0855ea1cf3c 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 fbbcf51a8c893561d3d79f814badf8e54a38c079..eb340c9ac6ad37748e7c1840ea1fe904d676b9c6 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 1186f4d81485bc46e23c7970450373c4ecb5228a..7a4bea901d634f118caaf39042fd76e8f7b1fe06 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 f618ec6ac34fd05955b28cfc9ba451524fb957ff..8ac7f21966a500129740fe896bf27e4a32aaf7f3 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 18ff6e70a133c9ec42a3710eddea51903a063029..f4576f2c5cf0350ed955e540c4aec0ce2f52dc4c 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 a0882e20dbe8ba45da733082697fd2b1fea4d3c0..1920fd6a3747f4175e53253b3b041e13091e1869 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 273e217c9eef7e8220c391272f25e347f45609bc..9c3b8c7350e40ee7aa8769b7e424bfdbdb9cfec1 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 8a7d10dc486e7d2e00c06222025ebcc0e0890af4..1474636b4a45f06dbf5e0e79132988250578ccc9 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 2391595c57be6f30e427818aa99c07a4b2a787ef..da81ad6b9657158c8900d2c51b75c1901fe4bc82 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 641674c720986a476a12aacfd25ba92d862b944e..fad8135e079983af71a2bed11cb1fd778e05b84f 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 d74ef5063ea93f0b88a54819f60c7816aa13cf46..461ead1b027c64f567fd230da250d53f91de76be 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 d4f00f09a78899abd926707f66282341dbb8af4c..fb7e23d2bd1015c27b261554de7fb5ef513b9345 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 ed45194b7923c6cfa62f0f98050d970b66676d8a..2f57798072ba19fe105227c8077be2c74867035a 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 251e436591debccfef2f3a920ea68319122fa40f..57f93922c32be5b65f0ee04d065c89f795d2c197 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 e52921e69599246c53869545bb3aba576950dccf..dce2034b77e74de4ab2dab7aec37d8980a3c15a8 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 0a94d2714870b6b8307bdb445926b1031fe4e597..160639f26759d617d73158343da464b27bb1d695 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 38a5ee758c3d9e7d209e7cd8f162eea9f2529c80..e7a22983485c48ff5185531c3dfd58d99ad25226 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 a4928c65f7a56ada16a1a800b215385bf9de1aec..00e9229aece8695e3a4f093047ec78ffca8b0a90 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 a28f2ac52b04da1414f894f4f662d4e2019a0e6f..3c64a3160bc4b8ef0b1bd3bdeef6c73c66445f35 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 88bcfef6d51a924ecb72d1a98b1f33fa9469b631..5ade5ac102187907947ad1ea009f898d3a553aad 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 4a6f18d1fba5e6aedea1639636e063611182a9b3..f69b37374684e3255fd5199e16b15c9dd023de43 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 afc7887f8b4b48cd82c31b738dc85a715610f5b0..a67f3d24fa6c4d6d3a210abdd77051632f2bc179 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 34f7306186a111370ecc7215fff70334d4bba652..1727bc8ca1c2e02980bd6da5e3686c5ce5ce5814 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 90fdab11ec2733503a40ce04ff6f9c0dc698587f..07e2a5f707a0465aab4d625cc264fb4bc15446cd 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 685688501bfbf0a8b254eb8af0da11db1a55ccec..506b8332a1f10f4c37cff75bcec88f4d39f635cc 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 caa673379f58f5883d3b39f3a2e005efec346e63..cadf08759d3feb0f07c7994049094f348a91b353 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 30c6e2b62d893a44e5166aca32c155dedc30431b..4a7e2c0f496c16aa445226c478c4661925719971 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 c1039d38a89baac5cc8a8d21144a33f5b7be6521..1c0fa8afed9fa4d8f3c68857344470fde7d05eaa 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 d358858b3c5d52a5341f17723dc9950a98ed2911..8f7e2de9073a142d322d89ec6a6b54270ac5a973 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 7f23ea0ba79ad4cc3de7107874d0de936d7cad64..74d00355271af446440e49cf595765a1c14931fb 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 24d19193dfbfff235485a8a779e65864732f11e6..ab858c978a635650b2e0afe9c8b68b113b42bc33 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 cf6bf25af44e19db2e18b8266a9d652e7bb69720..365f76dc40784574f947d70f249e9f94bf4fbae4 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 91577b33c1a63f10dea31e93025168d7ef9c3a97..c6217f28c59bc94d54751cd627ef0f865bf32b57 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 497c958b0cbe2ecc3db884823de2fc8b4b734a98..d6825f3f13ab283476643af631dae905687e6e85 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 1e9a2f0487d280d9df64c3d319467932ed51a1ec..ffdb6ae36647e851c1a72a801b95830cfa8a42c4 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 619fd5e61f6799d03f6406b813712d8f8fe4b6fc..992399b34294b942d2139dc07de734589c71b669 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 660b67fde9f71811190571e044270048df115f28..90b6c57c75b75c3db0dc5cbca2f9b39c35addfec 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 58a180bc761aa27a6fd6c8244cd1360e13436287..5a17f1746e2f0a745cffb4778c2b86023b574c03 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 8f68d3e5cccd1a6e6b482e23608501dcc8fc385e..c2b2a452a1b95db3a93db120c17ad57279cc1c8a 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 2e89b90ed921a5cfb5b57143a96e92b8f9f40290..de4f7ddbaefba0583c799d0e0eebb75d82c434fe 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 0533f1675b69b48b39137569663bf88b4b51537e..f3ac27843261f60f4f3d89f3ca047b8eefcb7ce3 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 3d8595d56e129380bad6b5bb9bd3adb835029310..bb23e807758574be4c1ba95c9e7132a0fff35e29 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 5354282753512d22b2999f9a15229a5583bd1ed0..498ef58a895eb0d0fc7be925b6cd5de410ca12fd 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 eafc8360ea90944eb32e4c19d72ec1d9c62a4043..5805c932b46f82c18918e0dc89c3077762eeb8c2 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 94c04979326d334905f66116f634c8a1403bb184..f6764e3c11b2e5da2248588eb20a9cd2ae04b008 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 67ae2313bcfae04f7e0e961f54c45372112d686f..8f86f70743bed4a870640a97b040777c507094d6 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 fa865f83709977b064e8e19cfef9bdb083f67280..3dbb450408c40959b26f7977b731eb88495c235c 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 39f4bf6c330321f730f1f95ffd1375cc4dec7df0..1233b1e795e1a51d3fedbc8ffb2735a1a4a3c229 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 f24cc15fc19947a17a605a29c41caf521373da9b..1c448fac3f1662196b8423297005d77e3b19f037 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 f65d95c2d72d10e27627890e5c9fd9756339317f..e6e79d08aa7ab3e085535766bd8f639a5580406e 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 ede9d183add7b9746fb262cc537e4a3e2ee050c0..a2a05721c1d610cf9f3dfedd6c947049ab79b978 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 f5302f8ae1cfa1352d72dfdc3246c109c5dcdd3a..328d81ac25f8a1e5a967fa75ebfe9ab1467f4308 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 8e6f9ab98356659c81587d842842c7e4babfc6b1..46dd61fc3b3bdf7d01b5e8dc80c466252026525a 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 8cc2f00d712b9c12747ae72df3ffed4f3bb5fb83..778a8985a988641679ae91c499f5d1adc683bb16 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 fa14b35335a562bb0b13fa938990dc65683c2aec..5d33544aee1748df91ad0522948dfb82b33316d7 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 7ce5bd0712d63e110a2f17e639806fd5a9732a5f..1eb0e0d6e4a8ac5cdb196c8375ae7d1804ac5115 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 75688d4adc61cb08e875896b9839b1798f035f6b..d7daba7a4c8093b60949c12ea6977b6b72773fc7 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 83d296b3ba419d02d5e2e4f65b494af2f0e326ca..f78a101b6aa30e4ab91f8c4fcec56c953fa3de72 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 c54b6c18b06ab7f8acbbcc17a9729d31e5fe088c..37013a2101524311c7aeca767f3f89ee695a8e58 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 1d71a9c7fc8ea459f27ca3bcb2d7cad54fa8952b..136b3b00b2a327abd7b8b4dda914710ddaa19945 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 14ba9cff6cea159176bd4597f2b36c9474347f5f..89fa5c10bc75ab4415bee2b85e3ffb2e3724db8e 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 c73a56bbe4832fd39080cbb5865676b43583ee88..3911a8fd6de2222539d39cc0272bc6855cbd2365 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 3c29b8d00f4baadcba50a7d10f74f57d2db31bb0..d7ec3a450a31eebfb8d8b6b805f77006c82c7668 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 2d3c69592df294c2aeec2816780f31926893e775..b396116674f7a21290a532eea841239365c9be6b 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 b9ab5d1802065266ba42aea5c7c1fde16a893f24..775b6bbfd29f27de40854968bed0eb826f57d4f2 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 c3af4647367318947d98ac1425809b574a4d4857..1a08316378fe73d708527e1574a843af414de8fb 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 8eeb8c49a2f6714909d351e53ea3d5b9eaf1112e..02cfb5f9e702186a136bc99184970ded8833b24a 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 6f8c1a9bef872eab4e97de7a1bc6dd14f80ed750..f39a3c8939334901b9577a38c7bd52d64b848781 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 006e0ca47ba3c3bf00fdab7054b4aaf73862e1eb..901755dfea414069b2f984e6314ff47150f6eeb9 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 e6de5b1355aa57b210b936bdca8bba442c10bd9b..8bc068bba16c1a06b31b00955ae64c9a7f0f4a45 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 7c31646ba6fd86b0f147b067ed37da435f7751cf..5809c63702f1fd1244516d3effb0146acdb05129 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 3be378341b7649f4a20e344f1312e81994d0305c..988585dfc187bfa2d578b90610c5dc41b15a7cf9 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 cd8b94e9ab03ac28781ac35c1a5fe2b499ceb440..53991b04334d41dc50e64887f0095044b63cfb09 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 d6eeb939b313946d6cc8047b6dab34638dfce3b7..55bd982e1708b73f74084754863da978c162632a 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 61d384cc2960dc3b2970f5ce068e57fcb59918ac..ff9edb2726ba35ec408aab03f972dd012b0ee3a2 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 5188538e5b63ff9d81e27c8a6b1833144098f135..f56e4fcd12843bb956849ade6dd28986ed087969 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 bee1bb84c4dbc9692775264fa4509d013cb09ad0..e6235b640b8df297876cd271bfd96257b24b3b5b 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 0b92367077b9cbe869efcc04c6b7cd8932eb34d1..9f941a9388df72b417ae432ab8b7d45a297ac931 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 147242d603d1f6b3381926d775004581e3a5c986..9488c87eabd8bd6ab38301a95bc5e8c762f670dc 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 9c8982f33d7620006f686c236b11409dc7cb2b08..ff66a256f456c901c0796cd5b7bea9012e4c2df3 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 6c7d71f01b1734fb8284e928160c87d325060042..53dc689793071dc8e21750fe7bb2f84a74f15302 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 31159e430a127db8766fdf28ff6a70de4b52f071..4b56e4d1f1162d406c10cf1305694ec4ea4adc19 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 f65fe4294db14d1a864ae791cffdf55005926c5a..dbd3d35520a1210012ab80fdd807ab5a25ab6f01 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 aa59b250f713216d65830d30e613fbcc2b193036..5178b69614830eec30cea62c96a6600103b3efbf 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 c0d98e75a4eced44098fdf903dfd4fd29440a6cf..cc21568bc5bddc8eed4484584ba52b17d434d314 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 ce5f0a9ce47bde77eefab42519f6a2979216a0d3..b43e8de8d63964c2aca8fcde55c711b639d29695 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 195b5e74f3ca01fe4eb071b1be38fd5718606de1..aec5c8fd9b3552016beee1d0bc4d6b308ecaffef 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 0a7818819efa530d94ef30c802b2bccd201808ab..3b59b920a3003552223e099645b7a3c82a732922 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 00ee84f5c60c7e9f3c840a45f19af70d5d1f02ef..53062021ee40e4249dd6689bc37b1d7eef2a8aa6 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 b5c672e3abd872ba07322b5e34fed1f8a7937f67..6d6911a25d0db5a0b92c2e331bdcca07ce9f460f 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 1e05fd865057fdcf6756e2e6dd1d9a55c0181e6b..01111d5e3a703b4ed01ff1e6c795342ecceef18e 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 889e4488c322800f663c2a74018b443f419605e7..2c28529ec6f629f59aa8f50d636ee24dcefc2190 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 b296a471661cea2ec2239c60f2ea16d709d8999f..b57add965a3a9782cc948844323b6829441e4fd8 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 839ee6ba2d66d6a3e259b2ffbabc69334790345f..e69e54afc6a93b6e6f8287e787361d58e82620bb 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 0c4704afea38815d94113d40c2b10395def4b125..ffb31c7573a79b6cdda5f6d52f661100292deae3 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 17c92fdb6197d1f2c0d919a7f1e9124de85ebdd6..9b8898acfeb675dc8d80abd95feab637534d5af6 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 4a416fbde838d60c0fd1bc0d609074b6ae853fe3..83140815993d235d15a65204fcbb7d1855924c5c 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 5d36d0a81bfb0d0e146ffd4352bb6a2318cdf8a9..0e6b2f7a0bce870b85fc1d1b83c360643a8d6f36 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 817369616d13b58150d8742f65b0b4e1ebc37662..13b16b75170d782ae760ef556d0a743a12da0c2f 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 1d0a19c0357ec73a1e556c45ca1d9d2f5c60cce6..d6815d360e3b883d984e36410238037d5bf091cc 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 1f9ad688e1f8f1aa720b335a497149ddeb28599c..e6be7f8a4c61cb9928e61f00cfe10af251a30b0d 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 523d572d04a2ad6366ae5fb39171580333f91f83..f497b20f771f45bf94f874d56cfa764fc9d83cc1 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 9866e0dc64757b4f13125893d9ea19eee1c742bc..d0f6529adcae027cdb26230b01fa238566695d8a 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 d70b157ce56dc577c447cfbc159bcd8fb7771870..ca725a7337490ec91f6284469b69c3abd89f7446 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 bc9680f25c3207e08ae1479284b91338065b310c..2e3005a1715ea703de2c1c2976eb4d09e21d5d63 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 740854863cec98f0dcec72e4e2ec107c3ac53201..20b463f18e29a6c738419412c62e27ecfd855f35 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 def93c9fd90cd4ec1d6f43705bd548ea333d683c..a181d00213410c4557b7d45b9aa71930ca524168 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 03fddd3c9d1787146c8cf6fbb1fc3c16e66f914c..d7dfcb0d360a2f0b6331bae8cc3ae430e4819ccd 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 33d90f3eea335921e52f8fb2e4ab7f99efc7d967..2184129d568c12ad8b3ffc7f2e7722fe5d405ec8 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 93918e92ac000cf3f72a41e86542ec450f23df6d..187e24156dff2ccd4728a2d3f65254818148ec10 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 86fe7ab26d9645ee59873998d6367e9bd2698f4e..826d235ffc021ecdc3dac5cbb246142aec5ca1e1 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 2635b53799622bb412dd1836b345347b1994dcdb..c282394156bb1750e9a31bba5e60f28daec81590 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 99137e2bde4ffa5511c124bf94e1366ed6ea8b5d..e9a6a86d69128216ed107c9925c09af3e95733d4 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 9bcac89165c222632cb334710b6f615aa3c2d442..a7b9f5d65484fe80dbc32d0e28afd5116d4c7cad 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 421f79020ac81cadcde0dd08775f3e7ae22143e9..4fb6db8fd077a8ac7862f04dd6e269c6b1e067e8 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 dbbb0f0343208553895058ce3fdaebeed31b7164..ac02fcfe18db38f1c1693eb3bcf2defb1b141bf3 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 7ee2b98f4955f6d5f1dd3683106bc717d881c51c..9f232385587db347dccf025caf78d58ccdd832c1 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 ea736a83f918a369669c3e12452acc9179c3ca0c..47501afde9910028f5d54817651c5aca99d5c9ff 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 20dd9bab3a686fcf5442eba76832899df71018d3..53a949106148c01415e3ec5f6b812779b76f79f3 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 fd37254da8e1d3ce292e923f3778fe26775c037b..5987c7f977a6f68cc9c9ca9e6ee3e441987b1673 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 8781fc49f6c1aa26c0762a53c4e00eab6e77204d..f8f52443452bf920eb319aa0f2e9b109ad1efaa0 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 7a9a612aef8f3d26258281a78b9af064a7f5ff18..bcfe31f51c7d1db66fcb22c8274586da02d3d751 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 47aa39229e000d3618d98acbd02ab5dd1b7d5c59..3850e99f9a39d83daea223355581b80adedcc246 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 52e038c1ab2b23db76cd399d1aee47bb66f89c6a..4c7b00334647cb36d990c0e303c34c4a970e0586 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 f9e5cf9c9a5be3c4608db524b15949bcac2f387b..2f7be32e05940373d6310f4f915adda915337cd6 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 afaa59ce17cc761a775df72cc4acd28f0de6f151..024aca0dcecb446be71dcc6a01448c4814afd7bb 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 3fc6c6edbe987df9de154cc3d6649b31edf7b7ad..645ffe1c892b2a2ff05dbc4b0b432ba0bfe8e4df 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 7a1d0083c12340e946131b6e024144b5ddb06655..df5eea70c5aadd127dd190a5f5b84263095f3a8e 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 53d31eff9470cf7f3e3262e018975e5e07adaed7..fa2f0fca99384c5e864148b59fc6da7145ad3318 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 065f6d70633e07fbd721342b69a6d869bdd99ff5..513a77cd7d17ad089d674b2a7df04f768b930d23 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 28a833ba5a3ed8ed9a8b1a5e9180079d08ef0b80..1ec10339faeffaf08928dbbe0890fc7a44681b0c 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 dec70e437cc80f1f6a9c7ae7d97b3ddd37401647..e62d6358fb9449e81475d08c1fb7dc629b524b3b 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 c01e527fdec028b2d1cb79f51f00691f35fbb20f..117400f867f10fb59693ea3c74706eec5c8e3a3d 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 479e10e6f9306cb2c7d66f2b6c1298b010bd64f3..7b7810ec9cedf2a66bd1bd6fa11405e09d4894eb 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 6b7f8b0210c053781babe16a75f33b068b3acc0c..0bf814e28427532990384eeb8b335382a763390a 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 d328df7f4a6f28b6cc40ba9677c820ff171e2183..9fd891fd67818325a58a78ab197cbd3c7e74c6d6 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 688ba74ad9e5a04cac3cdb2e13f566a5d8b41b04..b74c991333dccc4f769e38f6830a723160a69e28 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 15677a75c7c0a8a681cc63b52a22c1991dd13fd1..4666a1167115e2e76054accffe5fa5f661713764 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 b24efcb07ff568b88658e5f79d06903113f92454..7e83f484ee6dbd8afd2c16df6263b0f1b82383a2 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 e65cc54fa6636bf0bb0a936104b85cced6970d30..164ad6071304f3e4faadcd55edb888d064d699e0 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 19dee07e676a1bfde5b0b6a4aae558275d8a6021..c3aa2ee8699198109df606448311939df0211f53 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 695f0bd30553fa77b8ddf2a150f7754c71b4c486..77aadbdf11731a7ba070d80423481933826bae76 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 2322b1b6ac26b69542e9648ff6ff7741dcf502ce..24c4ac9323bcfe55b771ee8a9248d99b9cd7e21a 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 76df838dd516e517d9b31b30e6ba6142df1a90d9..2e0ba2a0b634ab25a85afeb1bc40eecc614d4f16 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 d63d44f9d72ebb78c6f64590ebcde1421fdf06e0..61899a7df280f4e8850b60af786bb7ffc19dbb06 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 5c452f8ad738d30f50cd69d7a275bfe526d840e3..5399192c2e2bb798a3d3be8c020aa7373b214197 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 73e3b92d2d7f4cde6e932e3b582abc8eead99107..b1bbab84c99e123e6c528d7c1002ffc45b3f0d97 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 23166458b99d0bf54d99ddfa55a779bdb0a62dc3..24dd678bff8d27230b670755950520a25a72cb12 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 987f9c3102f92d2c881e99b6d719a93ace451cd5..79e7cabb0b534878f2d1495f738a11e4fcb09d63 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 db0ad2d1a52aaec66091d70c7dd454b68727ee40..964ab8c877b4e40555178d93a68dac7285655df9 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 c79073e5b43c24debc97edec73792eb71eb911a5..0f0b7ebca48b853d06f112ac23ac649653ce90c7 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 f494eff60b4098e2e7fbdd0c17d47794aceafa71..d8dd6fcdafd19ff3032ce302c34dab5488f9d64d 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 50423ad848f1951336de3d6b6527d847b4cf96a9..3829473110cab99340f09fbf84409f11f39a2c41 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 1a5f3ea46c82bdb3782d8567fbe06a3b7e0dbb18..bed4733f2680d26cb5b9d128ff5b204e0ab11c9e 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 3f270de7fef297d8d40fc46a79f1e7c0071868ee..6ad38d7ed51fb4161efbb4bb13828bd361a817d7 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 571b2e8ad5c7a3cfb02da7cd9a7b6ca5a569f7af..f16d4128757e173c2e07e15545e137c382c13663 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 724a661f90b91bd1628621adbd0d13b2cdcb823b..f612a2b38d39b7e50a7130a20b786c11c114550e 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 50b6d51daa738953ac7b7339df9a4093d3948b66..c487fb72d3d2c1b36f8e7868d5d4adcc6a96b320 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 6bcc9a7b57f726d1f9bd25224eecefa5c22bc16a..4f40c1431bc810bfd6d66bb31152c01bdca6922d 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 86aace2ea7f44dddb0b81c00717c0bd66db2c40e..d43501b8050191d1480e6831724d86c2083a49d7 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 2b94a6598e7edf92c077d96567e4cab0278730c3..3acc1d2adb95561fa972abaea627ee8cef2e4732 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 744f7888696eec34667d57619216cc4a84c90f06..b3bcffdba2176e5c51ca492f3f258441e50d30ab 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 0753a8afb7ad6556859e4a751c3c379d65974dc5..510a32930d19349251c679a7fc0fc384c028d1a9 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 dd31d84acdafc07934f2481e4a799532252483d3..009bf2e8c7b4eef26ac6c2d1fe2458bee4276e67 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 7170b781b2b24a9d3822cbd50dae7c28c65437ee..f9dae20f62ec5256c5808ab6ebc6a0143060aa13 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 3b47923e1339e5b12754c5620cbafba3a17bdd70..eab7d2450f708e7ed94f2c9c5c2c62085e88d50e 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 e3b9951e5ce33025e062212481f64824b8bd1a14..cc12789266f813d0fbd06b215e8884ef50d59728 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 14a1051122a42ff9ec3eda8561ff797c525d68bf..ba994eee63707adde51d097a2462731e5754ec9c 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 eace057bce78e99cd08895cb4263ecf529352fbe..6fa412ea6b92bee33a7b54d0033d42f0e02d7dce 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 22d42c8293724233024dcee019d6efa13f7d5db2..87ea65ddf59ab546ebc2ea8cb488985bf4c5c1d5 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 d36f35bd06a99586cb822e1e93b4e5480695d567..dfaee4c131542eb97664b87a2888b191db6118d8 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 a274927a3ba10bd4fb65906e05cd2c001f1961e6..a054015e9a446993633281aa07465bcfdaab9f59 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 fa0e90194e44227997fb4c096bd6d51876272165..401e025008ef40ab16e8f6c68e38492100fc267f 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 763b6b4db34e3288ec5820c6d66dbb42d202417c..1290a55251e056a992d8f53ec84bc2e60fac1e9d 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 bf2c68869097258e04111efd061a97828a0da785..b171f2b41cfbe1a992e1aff0f4094dc580a011d7 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 f6db2b0a36ebd4dbdcf591245e8c7a8d9415f316..45f4ea0b91e2bcd33a21e647d4c8b342c60b6949 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 09a3987bfefe89ce1b57aa7304024e82301e241d..f2b0c81ebcad29391ed910e90234ce21de9ac9da 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 5e8cc8c08f08548c1fa3a1d540cc96725854ddcb..9c28338a1f051059ac72cccc645921e540ca60ea 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 529f43f1e6b00930ce15ae6b6382d612f0c5fce9..c42847c06ef1a855a047c0f755b1c01bd0459ac6 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 ed89bfdf0c61f063e14d31ba1e4b8d330f606f8b..1f986a963fedb5e62233335aee9cdf51f76537c1 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 07ff65b68c22690e1ade32dea8988d4ec362101d..9fda9ffeb5aeb66057dfc5e6a2d8a763319aca10 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 4106afe0ea9801073916b17d057efc3a73774efd..7902812d952f9e263be53633381cfbb27e568b1b 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 288cc97fd3912ebb1839adf62890402e70e367f8..5ca5a9931f309cd0ebde29e3ee8d0a98fc637206 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 fab2e9e1b9e1b845c8bb68dba09a90dfd9481f06..a21f1a58e9755335237c0d5d7a5ea207ff740307 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 54cc752496df956bfea33d88de0b30bf93d7d5b6..f1796f863d18ca9c8d1fb3ca32d776124116908f 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 4c9ca61e35c3905c84802bc96ac196e4011b1046..095cfe9664a774d97759cf706a6bd23b068a4e54 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 40fe3b55fdaaae6e16f2688a3eacf798f0ad3d77..c0991a0a264335d81d72dd5f2b1dea9cb099a418 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 7c1f495ed87ba5d2675cf0c84f07db66acd40346..ab84da8a90b6519cf49502456fac19c1ee40d330 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 1f74eb6685f62196789f3e1d76a6a4b69e0b6f64..edbebbe9a6ae2f611bb98fb4652ab76d046be7a5 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 c6fee018a4dde01dd4e8e937805f7818b0b05bad..6c7650cf1332eda4c580a18e3cd9e40c6fa3d661 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 1d1f8a4c1c35bd545fb1e066755884b231a0cfa3..e8289798d8828d12c77bc115404c86e8d2a62238 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 5e29a7b5ba7566f003cdb40f994642e746675a13..fef93b23fb67e0770549a96f86b1e0fcba7bbe90 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 59f21cd3abbe3281d6d69937858cd9fbab8bec9f..8bad160579d733d4f21bd2b88e39b46623778242 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 cbd1ed6c2bff2ea91e0d340c1ea17a7193976cde..87e6d2ece55aa4b0ef755622716c369ec6c16a87 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 e5566e3dbd5705e333f9e89a61540817a8e20d3b..dfce70abf94657803d8385dd5e2eb5b0bf2a51e7 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 f8d2558fb7bce5b0d36f0657e11afc06025c9948..3554fe690eadbdb3beb8059ecde490fb89689a25 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 de13e6d247b48f04dcc43c6494805df5c6299d08..5673b33dfd3eb02e52b41d6f8d3ce276f1903b65 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 e6a8f718fbb5aaf5b98a50e63b00300e826aacd9..2825617912916fb271c67413f23bf2981df242e6 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 5a3494e90859639be248c5965f030cc8c72d2941..c7a518ec7de86682fce774165a6c8ae82fd432bb 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 52d8bda67cc58ae65f0231716adbc18027fd9a16..0854d7e76eca65486a3bc8bd0b182111e1c6b38d 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 147e05028eb20dbf36cedfd6ddbfd3311c0c853c..df5cfa07fd0949551dd172cafb0b2e09a8774db0 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 147e1bafb79bafa70f9d0582ce18f34ab739729d..042be8720daf82250c16c6518e0279e576f0862a 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 a2b630a7b71fbe5238c81f6ccdc823eabb181221..3eec2ce1e4e6c12c47e1db2f2c19df5b20734ae8 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 c47f9cb8ed9ff3903166530cb3fa6157c3dac73b..1c90b83c99ce53d7dfd36f2e30d1964177e88654 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 09a01fb4f7a2551ee1dc0ae9df273d96be9cb4f1..6f0cd16fd1137cb40d1c6f09f9b78bc8b5f0b487 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 8edb5c9e84251c9e41011a61655c8f8765838328..359798c74d8f8c9885de6c7d4d94dda4a8216466 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 3e7bb59f5602c69395772bac0efb99352f5e08c1..27c46d2dd6124d90370d26afdd7cc01c8133ce86 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 17b12b15fb07951d2a9e5b717cbf1d57139ad049..0844ebaebca0bdfbf13435051373af5430fc84a2 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 176860990c7b03308811b156631478077b0ae5b5..6c16283a54b38e81dbf43b70a2a7da5fc7a66c97 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 0fe99376e57c8a28f9c881f7683a1f3bd8b78d50..79a6a31a21c0e5923e6033ba5c4a7fd0f7966457 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 d6411d971610f15b16be90ddbda22703828cc5ab..9940b495abafbb570a055fcec4afc9706f7c8cac 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 3b07686f3b4cb6963e15a6a4f4321b4a8b8524a8..ed2c13e480cfd3b5694eb624de972add7f496469 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 b9bf9872800ebaf0cfd59f12cf5d1d0b942fc6d3..b218181633ce44e553917c5a02ff7d3ea10c2861 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 553ed0e3c3a9c337a7a5596e998363c3201c78d3..32cd418bd95c1c36047d88a02a1071482174af35 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 0f1e5a5bc81c8a9a2cf3a965e104876da81dabeb..ed64ee64c73722ef7cc252470598c31b722790f5 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 c7cc6d4b5d4942aa32b478ebe18d9e2fc136de76..671cc327890a5bc34401e23ec7e5b5a4fa67d37b 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 53e10bf67731e9436f7c1c06bfa46323d74b01bc..d194a87d14e923228ffd58d32309599ae0c9fa5a 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 de7c3bed1ad165533738b70cbf1d7ebdae33ef87..0528f283c875b1fa14028cd6e3fc5bb7dbc09c22 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 ec7ec4f0715fe6e079d6d0c45f4102cb97d9a87a..9b25b07b91917cc36d91e6adb4f7964a8e013432 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 40f96e671bd86c838eb9d0bf84c7cb7db8fd2728..30ff3619944dad217301b6158d854182d705dd91 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 d8652c3b623e26882c4cd91bfb63e90995ca364d..d251492f7f627a73f10f830236bd7c68705cc4d7 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 8181dd95d904b3d6d6e74161ba20090d33dcc182..0105c053fff92e211d851968a15c7becb19ae9bb 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 ee66a99989de456a3c7f251327155b053de8ed46..c45908f205d55ea25719fb5604effbd4fea54479 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 d9cdef6c8ecebfc0f65d4e2bc14a855106ea5f4d..1ec3b2df5cf1efd96c152126677a06260feac278 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 a173b9d538b88e895d0fdcc082e35b8c806172b2..c77ddc962826c0f9bd1aafb41f0253d09a62fb57 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 839becb4873422388b36ba0b99f9b488a29bd0e1..75162902f5bd8fa894ccf93953e5b08ad1f6ec50 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 98f8d2fd4c83f2ee92befb3f6da73ef8ddee7ab1..8046cb30d6142a3666f1a51cc9e6e036c30efcab 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 db64073b8f0fd016556353a20f4abeaefba54757..9b16e32e45799ca4361aa4f350e02ff8019a1507 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 c0f223d30679aa037b60d8d4f3ff7fb826ae8b62..7c1ed19f3f5c58e6d1ebcb03daae7d5a7a8e62a5 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 070659c97676c79c7929b5ce0f6f9cd371b97549..a432559bfe4ae4972fc973b086f3a42ba93b67b4 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 af601df68d290bb4750334bdee1f230671cf73c4..fbe8416ddc449f2b9b0f684ba39bbe5393731a2e 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 a88b925770c9a425e11ac7a423d4d95d61647882..ad30b2017205cb4d82944ffa34833f1ebb39f40c 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 53d959fc13a9195a9330f4a6f3bf36c722bacd4a..56b0e0d3ea0ddc9c44d1c475d243c4aecaf4b338 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 e5e9831c46d9a9902adb59a82a8752e0bbac55d1..705fe0aaeaa5b1549050013ff08b18ae55e89498 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 1dab14b5166968d8939155784f63b69ceadf6e4f..b05dc176f4306973aeda771936086f0cc2d213fe 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 35b8d6f37df246c0bc0ed0873eef64004a4b24b6..3ddb43bb2d115b6426d6559d3a15a288a96bbfe0 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 efd291534f05beef6aedb041400ecf66810a27c6..f40d0b1fce943a81b3372c121ef8d6efb5bf151c 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 33a71555d4a45fafa5f6ea4290f8943b46069212..6c9d4804ac3d191b13f451bdbed7e1542e0da089 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 33c610e35cb50e729ac97c7d7a4e9afed8aa0d8d..7d797a32256a321f2f8eddc01dcead2c72f31b6a 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 c022b1776be4f5020575436365862593ea5bbb72..9873f02f0fe8170fc6d2a47a119cbfd1dc41744d 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 942a8d203bae174e6ad7b5ff15e8a1735a9c026f..37edc82c499c5e64da9a9c3b7893f19d81d3db38 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 f7e73897d78d7f4004b0f0958cefffbb0d1e5007..6444a9ac85dfb12615c01741b46fc1d609449134 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 21438a5f352f1339828730a8b7bb7f07a8e5c195..5af426438a66fafd6bf5f4b3a27998c85e0f5fdf 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 695c416e719528f9de11e95e443935a38825b3a9..9b36bfa924210061b322f78946f58ed26f3e3988 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 bdfc26083c78718633da54538eaaf8aac408d5af..3c1876eaa893756506618bae4c409c3c64af1662 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 08ad51083be1be403ed1220a0ddf317317d2f128..418c576041efa6603a23f12112171e1753c56343 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 47f5fc3c334ef2021e8da86992ec2b4d9f8823b7..3edcf04477ac37f676d3c44ce3b1f8d17c8cf4da 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 7c7ab5862759c8ed2f683fa2afe5e469ab4f6776..b4de5041d9005af8c8a904da1260dcba5297d861 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 20cdf9ee909e535b45900ddf86205544c231ef1a..915ff512ba747cb2c18608af78ec4f376d0ff2f8 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 992863d7e622b23dab604521f77fb3fd61bd0bb4..205d71ecb4757fee4abc0f93f33566fe80ca9177 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 8d7de7705c045f58c40723289b7ce4997d8c2d6e..524bd19b2d63454a062aa05f635a3585416566b4 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 7324d797e543b80a769f6a0c51e4e5c1627c81af..5b9006c3d01b09735e033f357c7567e8a3a7a469 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 02e865e24bd0b8852d96bb6c4e81496575c667ae..06dc3062ade620bf29f1842acedd218686a3bd7c 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 830035ae6c53d94d6c8467fa2922995be2c8264d..c22c62a30664635d5c489150ee71099a33a3395e 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 9f47b512b7936c675c52c971aa0d8ab056f3c5d0..b75130974e2f09278ae849aae82d31cc29f25fd3 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 924ccb2ced9d09c48f5f8e4415bf48a4632f3d6a..4667eb61ad1195796f7df7b814c796cfd8485199 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 fca817e43422817256f4df2e42c34d4c284a2618..d53b58915d2c73f89ba7249841bc39d95bbb66ee 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 dec33c62176c7748808d9c96b3af000a7e8c4bcb..345268a4dfe94ab569c03d254460864cf27ee643 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 ffcea18070fa05b68506853128dad1bf127f9df0..823beec7f0fcbd4cfcf742681d1c708206652b03 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 3ca776114de3aeacc3f7dc6ec413e1dd3ab6ca98..0e61f8a3989625c3b7dfa52a5398cbd1022e49cb 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 94b89bac681af6cb19384efe723ee05fb85973cc..b3b980db688c4a1cf96dddef1cbbdc8ae2a1e047 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 75ed4e0646ec37582841d64b9e87f0cee588b468..408aee6abdf2a86434d62f54fe8e6796d7d1251d 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 72adba0d07fe04bf997f7c5616ac64ae71b8fd82..59cc6bed9d7228d4da31358454b6f62bb6a80206 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 e1068a758ae24560fa5620a4de333fd5b7dbc401..14eb2e3ecc1c6890d78512917cc279fa4a897ca7 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 6592bc04f66dac7af28f2347597b9e737637356f..197b1ab58021691bf6143324b3277f91b46147a9 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 4cc689c297acb6a7303f5ac30f3aaa03c88337b7..a11644845ee526ed74d18912c85030af361e312e 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 590b352c67192aae1265a3bd43ae7dfe31356d8d..473be0446b8ea95f64d8aa28ee33d99b81a95c14 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 dd573d367916c38ca0a56e425b815002dd1c21f9..45af6bfd6a57e9691c8a0ce4a8b8fd4b91412d05 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 e43a54552c2ba5b339e8ce430346fc9b477bafd5..caea89adfa554a93b0181f3b7c6392b46cc0bac6 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 f4a46396966d75fe30a81412ff313fbf38d0edb3..9e14cd90e265953c79dbdc7a2c318150875326e0 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 15e57d871ea2a8abb99fe61c1a95aabe732fa704..adc138f8397fc0dd3f355a74728c2d2726b079c8 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 7922816b7dfb24e2546ed6bc7222461592f1772c..79b4250026a32b2405b4995485a442a597a63f29 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 a5e94566ea07e455635258de1c14ee7d706809e4..ca0dd6ae8ba7240b86cafc327ee23138cb7cb72f 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 2970cd3e79c20f00754ec2ca46f256b9684bd798..7ff046be2112d54007319d23fc24ca964fd4af38 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 92851284e26770080dde4df611d09cb928e048b9..d9a0953de04bcab6be417fb02335a563dbf11623 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 e80b1531a3b4637378092ca6b84616318a7e20b0..4c072f06418e1b69c1625ea694a2081c540fc2ae 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 1cc440c6a78541d7a074182048e31663097d4328..f3d54e90f6616f7bb68132b20c5b8022e56bd08f 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 58df58b34a3bd7656653493ead96615e18184fef..5b1d5bceaeab1fe9dcf840c1980de27234b45f5b 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 e3ee0a596ee2502a353863a384beb42f4b43d25b..eaa7c61eadd5ae76f2ee564512d32945aff34f75 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 a9d251a2c961f6fb397458ec7c66c86ab3e2d4c6..de2c0aad6c516431400d0a94e2efe9f33eca86f1 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 c7864a87221d3e7ebff76c5796beef8b04f891a0..d4e7c3f2474e763e40b2895f4a69babfa943ca2a 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 a2b4767f296d9ce5177a124e24b3dc8bad67cb0c..c6f6f14a447a877c101285c958d2d820144f6ebd 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 a0af45db27fd000bc1178144441f767829f16369..4ce4bd887a35eb2df285821991dad499abac9f16 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 9fdd2d9e77c2434213ee71a45cba4e13bcb55c9e..e9866e999eb342452515f8c16615488b095e7d78 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 232947eb38a7e806fe6180f03f1bb296e1f3193b..79d26c6c8e8c0d8c6afbd0425839a8893850de46 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 9eeedc27603f0afc4fd8cb505eaf317a92983a88..e93072270fc6a5d55895ca58a35bdc5c725fe7b5 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 2a5dfa35128d71ff3c641ebf9ce7bb8f33e6501c..36f5e966a642119b507e1f9c324d848d2e68449a 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 29ed789c1382f025e36c1f84bea5d2cff593847b..5a64a70a3526e7fb894f5b3f53215a7cdfad26a0 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 b314bfe39d1d52e71de875a0dc70a3cbb8adf3de..bd89b129150108583da29b150cd94b0f568e7eb1 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 825b03437a6c67291814c23f1b58e789ba484836..9150e70bcc07620c4ebdde1645edd524bbb6e10c 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 0e30e94d0b5400abc23c04f97c92f4d1bb4c1e6c..19842cc1b8fb74d60dc653a86c61f22bdcff9bf6 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 8c699f9fd1f4ba7fe5b5f9e93761e1f5e2efbe5e..9726dd3313b6486fa6c64f23e565c14e04423f37 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 cc2d9ffae63e1b9f7e81848b43123feddb00bde5..e9e73d080ab873cec170c64709e52dfb0a3cf55f 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 d5c32a857ae675cfb0b1914d7b95b944af5829c2..a28fba98ca42d669f388fc5ea041d66a68ea0888 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 2f56ac4bb0484f477daed1fbaf4234b966d88592..5b359e4db20e737711176846ef0996767ad1e9cc 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 e3865a0ca3965c71383b5d1313f6d8f0fefce7bc..4510cee2600db85e7bc1e0543747f00f4c2d76b5 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 a38dcbe4bfd9ce56ee81c37be8c4a5ae762db53d..968be0e7f0322023b1e30325686a2c888f081db1 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 58cf799b89feaa25a3216d65d19451bd83a74ad3..7ba2969a3b1e7a5667542d2bfd4728b190a2f459 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 f0c8bd36a61a33dfbb74533534f552bf673eda83..ea41f1df5b18c8aac42704f2a9167ac7e08a8ccf 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 9dc0000058c1604f2372abe13408e9e816543ac1..a4a27bb809857d0b37eea30f34b180ef24831cc7 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 2f64bce96635528497a35e35460430ab0b3bc515..d8e9938ce8035ffe2d6e8ffef78897d193a84578 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 a3d2e40a300767e089f3a167c9c8b0e03dcf0077..01dc3774da3f8e6dbaafdca65580f709f523bf7c 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 9922fc99cb33e4c9ed1a899b16c7a8d76ec848d4..b07b648ee131b02620df9ab78e16efe88752dfee 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 900e2fb74c8f0511c6d3c03032545f49d5ece4f7..d3bb0daf80665dabd5b8dea226ba5b15e00f87a4 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 63a764878c3548b8e8a99a95dba874b144cbbc64..e57bddc82b31cda44826cf768c3f15bd15c96570 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 7d869b016470456eca6dbf0528f43d5e1358f3bb..b29dac0214a69b969dc7351f15de1b9fd5ba78cc 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 a2a3fcddb4f85eef9aa6e28705f872ca854d956a..db8fa9039d0528d8e3ed8cc6f708f746d6ff36ff 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 87d2580d15c34fa8d865295e759a393bb159fc74..1a412c6dab8b5eb5ed47bcf10b59e8505cedc565 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 6a57b962c8fc51edb4406b6213139e19d5b246fd..2771b705543a78eff9744e1ba155f21713460ee8 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 eb198744f3a528bd333afa87671c2608c3cd33be..be979c6cb82ed3f062c972bdf9e77a94d6b802c1 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 e9d20c1043a6c8af28f3b721d597b8e3f59e053d..e8b098afd0bec3f8c1fca9c1ad0c299a285d7ee9 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 094ce2a3f396636273dc27c9431daad4b5f592fd..4110a10da2bf54a17f71e83a47d7ab7577bf7c1e 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 692be3c4a96f622a51d599c208acd2f7da6afdc9..18324769cefb512cc696cad94c58409928043d70 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 2d7d36b1b6154036a373905429af327c27b6d25c..609cdd0fed3b6d8878fc628950534f141b39b980 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 54ae488a55d19ec509d831aed4adea8b308e8cd0..4da9bb43c54f0fadbe58c088abcacfc77ee1a425 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 5e1236668bcc611c4e57b2e629cbc37409f932f2..5b0ed88fbac8830dd43f0742798e36c44640928b 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 57aa08c1284ba28c30f1c74021268b94f564db3f..bf1b7e828bb8cc43b6386387df0d062b4c6f5936 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 0c7a596a19ef974185f6d96b00fecd6c8a42c0a4..6143bb37995e03fa169f91cf9a1a479bdb7c1380 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 9c8dec6d64820af75560c30598ed9e41b22da788..d3c1b05fa0f15b5f2e1f68228ae31c0ed20ae61f 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 f61cb38755fb38c163a61946d11930ac4b3fa92c..ba52191ddd40fce9d48459084eb492560ecf7c9c 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 4ab0dcbeeb46830a8498c26e8d47cbeb7259223a..28eee5c7b900b2309b142b716895e1f50eb92045 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 fa2908ba2552da4b04f643c36ee04f86eb6dd36a..98b5a067b929abf44d7798f5d1873def4e463182 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 3971f6b521e32ed6a9ad6a086ffa6d79a028aa8d..0840c797d94c4a05b592faf857939a0be7e5f834 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 db8bb870ccf3646410d2ebec87c2cf2e29945b59..5dd940c5c95992c14fe4bb04d23210d95465b54f 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 26953ae4544bc0f2abede926bf22a99ac4cddf90..ccaecc3d04475bf47fd1a7f0174ba22cd743458a 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 3aeb72f5a4eae822c01c6241e51f6d60bdc73d41..63ff1d4804d89ba44e58da05f003a3f345338994 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 728629ebbbe2bbd49d4782fe297e0f0798fad455..c30813536a921ab48669ccf3d44189affdc2bb57 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 a20d9ad78754144ae605052359a6772e0ab17a58..d29a9b8858d59650fb7f5c0da07e98d208a0174f 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 74c11d08ce70d9b776152266224f1fa14d4d6b55..48fd49e2ebad74f1dfd0f415d94cb437859ff136 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 d507c08d97316923fcb95d839510a5a7d12f9db1..43f93e6a6cc5857a269a2343bad6764fc7364675 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 b05dbfa5d277373aaf5cb239f55be1644c303746..842e4a423118b6d90f0de2d96fa92b62e32c6aae 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 d57980f4992fe3485078d52206b043c9c587109e..d1968f5300460ba42fd11ea2ca6cf5343e56287b 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 30f116b0b255f76294f5ebe68d24217f58bed609..9c8b919f9831f41cc3279b1ee5bb374dfc6476d6 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 ad2486ca547b3c745947a955eb5150435f3f17dd..493ed93b866dbcd08fef56162e368a725becf520 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 96f4f1f1aef7b773ed31f161e70666fe1447539a..a718aa0d8c9abf5414f6a5647073579cd359db50 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 89f52a865b37fb1cb62106c990c6bd0cd6ce743a..dce8c9100d36e86168895719ba87b377eb64ca40 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 e0b64aa0f3acb5ac504647802c083d8be6faec72..b43869e90aaf6c82c7fea628d34ed21e19cf41bc 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 db0e4f8498ac20a3323bb0c9f9419befde180558..da6d4431428218dcba83533c43d44cdb432c6b54 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 2deeec4b38a11d3979427cfa87b864f15e90c685..dd4ecc01365b470bdc64e541fd23d52ff21fb7b3 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 e40c61ee4a5c53c32ab61023dd7316b4b9b12881..d7221947ac4938f444f712fc4b215fc1476b0e35 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 c169b4a648e77d941d23d375501ca2fd448554c6..7c84b9a76bd71f74ef627c6489f883435b61e058 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 6332e54d135032c9183c0624e16a30c840a6a2e3..6e8b073298bc5a7a636187471e4b9507c6950f40 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 6fa47339ed648aad4498105f9103548e27ae97e0..ce742003bf24b8fb8ded933f789f8e329b828ec8 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 0cddf72533e137387a8009cb48b0575dc12ec66f..7e82322f27e91a952ed551f819edd5013581ff7d 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 f2060b47331cfeb9d5c47991288502a3d5278896..62370cbb9e27af73a63254a87260644e3f3cc01e 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 cd46e3501d24cbc79359b4de7e767f7cf56fe6f7..3e11fca090508dfa3c54be7afedad45ca6946c0c 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 1f302ce0a9081f0fd0566a99572764d4241a284b..2bc03f692cc6c3befbd380f3aba5da8ac4482c3d 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 8e0ed009362fb6cf74198a8239ff17916ed27759..20e594c14fcc135acbeb318aaa3ea0c81ca48f21 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 584c72cb372cef7e1299c90e18b82fa54898f477..460be62e02c4d76df6867769d8614cf75eb09463 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 7adddb7fee27aeeaa5a079037312a83ebe024c8b..702bb59e485c0e34dfb2acb1590202dce57df614 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 409d744aeee4dcaab9cd4ddf1ed283cd7efaaff9..7c5062e956cc4fb2a043bf88db1ba347194fc122 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 dd1669e803b0414575527bd8073b971b985653bf..a298a43035ee876ae23931d0d105cb156be3774c 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 354d445d40ba2f96b00d2fd4613b8d9dc7100c72..f83ba4c2a8dfbaf7ee4037567cacf6e8c29c7bb4 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 3151002ccef829a113a511402bdc7db9d52f5289..9592691f81d8b2cb05f46192642e5a506eedf8aa 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 3b2852a5588cf96cf49e999e309ce7fdfbe969e0..9f541c82e9d4942b12d94dce15961f4ecd753f62 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 ef5732c440483c78e3825393fbae1be197205c32..8dd1611471a7a44977adc37699202d4e2c763218 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 5ff65c98e75b5b67885fd6ab8d9eb10139fd61e2..da6dd26e4cb81df389ed95482c26d2b97ceb4805 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 07ce9e847f1310242d935d28ce9c7e243505ede7..b895526a7d667193d78ef5393e2b226f68329392 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 175699c45b87489596bd982eb3d6ad51e34ad7cd..8bba053de69a765f6a9961c748df07a3f3584355 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 9d74283e44aa35699a8308c9abdf76e8de226705..9245ba48468ac70f2cccefcbb7cdb135fd28cfe4 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 1d186251407b000877cf0ab862428d38188bcd0b..3e1798654a288d53d113ec5d0188a5c96119f48f 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 f834ea038729a2d6ea35f6f6119cf9d06b4d94d9..385fc4fc44078d0e97e6591b4e25521085495a36 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 3739dd08493ccf8a7e7da4d669066ab03825ab11..27cebe9f6a85ee4ab313a35390e8a33f5f140a2b 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 af334a6af7ef51c5ca0753b82a27a0b7af06580e..b519dc4816db235c178c30ffd11cb72adeffefe1 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 9debaa8925b009c077380cc58501d2b9e867c98b..e7b70ae95c350f70f9d978f36ca90ec30da3af4b 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 83f81b993697231ca1d99433a1f51a31433dbd2c..f157462eb768d3c576893d4e584f0958f5686b93 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 079e4086dfb1ae9b5d97b650d4a77207238beebb..9107c9bcd26569fd316efe7ecee41cf1a9f4a030 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 6ebb60ff2d0de36e7df03a46b095aea7935f3cd3..2e70a76d3a9f8229fb81f6c4f1673c5759d92b92 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 d504241d03be3d11803567da1012ec366e67d5a8..85ef02ad2951758f932f13b4658f188a86c8325c 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 45f0bcd05070144e8ad29ab3d6598d5346648d72..0c6f2d0e8638a71f80b5a53356df374c4d0d4d22 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 f2d7ac092eeda7a8cb8fec6be20cedbcf762cff5..aee42d7be21f349057332f57eee1e32ae6ffd3e0 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 0d7f8f9840cb2796d7020d7ef6a528a6ce2f752d..c9d518d5496703de094508413bbc65502f7cb683 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 b8ee9577a6dc24cf7cce1f13967449c0a1253591..e89ab349f55ecbbb25d384a1e4836eeb3a1dae80 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 e85ca48c80e1c64d67407592db3ede509c343d5d..210d0aaf923d3ab8398ccb202e83bffa3d2a4c4e 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 8c7ab51bc021bdb23f3856066a589d4dbccf1ab5..92e4dfeb65e5e79c20f2c547a8606d2b60bc6fe0 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 2bba766c6891bceba652988d9ac844ecff963468..156a83ac019f3da89d6f03f3caeeba0228668f6d 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 0a479813df521282cbb5a2643bb3ec817845ae4b..5f44c714cc28796d7e4a56a8268ab804a6e813cd 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 40b146bc61f8b3bd78fc4d58c78e2225ee55f38b..9470fc553488f770ac22e3af7db0d1b6e468ebe4 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 e504c2199b97f4da51623e1792acc032599bd7a8..94b8d24c4e60a21f191264f601abe3df8f891273 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 ba49642175cefaeea9c60181abb12d29162b73fe..42e799366a761cc81eaf40768a264d953e458fc3 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 eb8f9f6cd6b937f54a10ac96146d671f7e4ad046..f2b6d474e8666ba3e85592c93110cfe1785903af 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 659d80421123e0817a6b1c394a8087cfbced07c7..1340d9c34cec718080d17373c1d175095de4419d 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 098c8f2cc035e4eea3ea6111c19de7a0b0f55445..67243b8b32aafb5635dbc338c85723409377cf24 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 0f5673f8858f6a5a7aae714a6a610aabd9f7a64d..16f5d8a74dc10c7b548ba0bdb395176b5e94b6c4 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 3cd54cb0f0c8cac5b7fabc9c4b7b04313d428b22..5c85291027a39ade0535e02498aff41849890b9d 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 d16f52cdfa5a8ee20f362c6b142032d6f127954d..c41bfb0c2b5e771e373c5560677e804e65109470 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 0664089ea38fccd643467b3ad4e2d30c36e0d4f1..fb3e040e9cb51a2fae7d69704fad1dec47587eb5 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 8033cabeef23b72142167e3d7a6ffa17b53dd455..415646201f5e6b898cd1ef8f453ab31231b2bd2f 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 ae184aa71d23a17b81fc6fee59a00ea293d64685..768851e903bcea16ae4c46e6144d4bd737623621 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 6c869a457b4a19b89cb12f039b07e1cada7a901a..c74f549c81ad231a23672a5c937fba47b025d1b0 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 44b5ec8b4ca225b3939116ed82c400fd93a04ed3..28cbdcc77e57d1f8fc0546203603d1ef0b2c5b15 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 1616d12888dcf2354a6eefd225cfb67729efba04..3e3a638ab3e7427104aed44619437f02a75d7cbf 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 28dfe38963860fc3e32538edb3cb31dba5ff1b20..bac18dd736b7a63570f045fc809930d024b9b7e4 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 97555c7fe091880893c5dc231612699990d4eded..16e9d523ab7adb6fc2731065a56813ef3d438147 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 d80e9850d79d7de98b8d031fff024550885abfa7..c75cd0fcfbf5a80433227895ee1c13b875ea85bd 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 81fe7cf8c702915d3fef6e5b66272755f96e068c..001c319a849da851a34ff0582a0a40812420f173 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 5b86b9404e1534f86c05bb64efa2768dc63b6e60..3d0e9035f0ac5fd08c3fad54af7e5fc4b609142f 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 06d3b459cc70a225fb1482ebb5ca874ca1edc4b1..26f0a4ae0e3f2c471838aae8e5f246d367c45e76 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 b00e54d8042cab26b0ccde1229dd26f4cf1df27e..848891a7982a45c5dc9d09eee14da712a772f6d9 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 5e285c9b397f950a8bcc20b3087c224e95a55200..f33d062fd5c5f01ad1fbed148aa72dda7ce9cc32 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 4a578bbfe65df44edc86ad22a3945c81678cc4cb..ccadf2d6670cb613b89808e02c523c285ab0e8bb 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 a81bbf63348f4422f57335cd13a7e0e8e5b20e8c..e3837e07a919d08154c6488d5596911da53599f2 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 e44ac1fe386b087ca723638de2585e55aa24208e..fbaff4ca943c9e404ab05c8546944edc86c7ee61 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 317f24f3a753cc83c6364ec9c15c77cdaf1d80ad..05ee72e2534868511e0a5146e598f60fa7599726 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 79210c7533c204f877a8a3cd23525d1c132f0f6a..5ca2650f3980261369ae04152cc812ff70f6f6fe 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 15c9837e856cc930966a208d71e922ec0d0aa470..75843198f9cf117361e38afd62a7c2131fb0fb08 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 69ea8cc7e85d09be239176238b59a9e6c99ffdde..09b0ef8736f084eff7876d5abd6367b66fac1099 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 00931df65f22f8e38f76285e5b012c37fa59ab2a..78b3fb7af637541bf61508b0155b0ecb92703684 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 826c5f6736d89067ecd5a81867ad8f8ca9160b7b..0a089a5808a98e2dae82a0c8e14672fee4e6914d 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 5e48e0af0b6c4feabc148b1c11f0226e5a994b50..4d93176e1e20c4c18509b77bc4eafdf6a38a64b9 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 7cbb99693282c9b5d0952cb7543eebfd98ed8b77..cc8352b5a5536ef62abf36419596723dad169e54 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 25b141d7ff4df87b0e9a31ef183d740dfd758865..6a30f75f8dcd207139ff81d17ff7607143df93ee 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 f9771c7919f5b1e3a0a92ba1d65d8657e5326435..15f9f628c4a1f570ebb9c72eabfb0ca0e3f2db13 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 5991b0d82a104b424e1370b598c605cdb02284a8..74459b5f7c1237588dc04c705dbe52ddd93030fb 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 9b36f7b5d82125e07dffe3132476abe547e8bd05..1482dddf8dc670cbda0a4ac62fc72b3db0d14035 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 204d5110ccca8400ba87ec854d8cfdd22a79bcd3..be3eae60a0ffcdae91c62737812ce02f1c5f212e 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 993ffddec123c95b31ccf5132f33189906b4a425..36c37085ea146086187acdee6632d02dd039b1cf 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 69bc114fcda553805c46646e9138c32cbfd72572..65be16e708221cc661b7cb8804810eed10bfa2f8 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 1aacdf98d57fe292a2704c3d943308baa3a70fe7..6f5d9ff259975f18dfae55d9c2fea546b53ae5e4 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 7c2cca12c29334dd88f352652972776f3a4206d4..25d66295c450e8fed0ca0eff94f3333922c9fda1 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 f6f5bdf4de4f514bf375b4e39588a11247960b68..a2bab55ae55487842f6dd6dea9fb7866c357ce46 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 d011b107f93368b1bedb8f2f3bcaece4e3734ac2..33c5c007fd6632e96e9af3785eade6f1431d38fd 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 cf3929b6ea308bb2cc32781ef361a94e1fc4a0a2..0414b4bc1c4af8e4717f619266d396a4ba864d90 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 39902a38c6d862b229e2c94a8d9972eb43bea0b2..e84bb5cbfb450503848b2591625caadb57ef7257 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 d2da1b96e98fa57ba6829f7c45a3f389a8126569..aa98d465ab1b747b03d8b775ec12a0004c5704b3 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 0ac3ae14c73bc28b6e1191faaf960f581add6828..ea2a62e1ca019fe14eb8178842cb36a221f9e71e 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 847e19d2270be6503f37f4cdbbed2219aae3ca6d..ee53feae6e164d202b1cb5a93366c333aaae5520 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 e76479e2de67ba8e85b4c5756c48bb995f3eb494..2154fbb48b8789414b267d360c7c03029f1887d1 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 5334568c5f893eca49c3f95699c1df297f52b90f..59a900fdbb9d7ece6e6d76ac4400e26f47961ce8 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 df801c19ed5ee7f275604c963dbdf576ea3f0e25..4ece96247a7a1fb4adf05f7286b092e14da27771 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 621198ce3bea06fb8a6aeb2b741ed104b66a08d0..ee2bf1a3c2af63d9d6f6f7fdc897e27d68ec6b0f 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 9fe763251b98097acdd6605641c6b1d8023a5791..919a650dfa4450c23755fb8ba872fcd8cbf7fe28 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 0cfa114b1bcea7a6173f8cd8038a378741fc86d3..6469c74165725bd19e186bb298e9ee2eb48441e0 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 16143ed3e7c70a31927a86041557c1df43aab2fb..bbaac767647e915c0bd053e8be8f76755ad5a54e 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 6b332f2a434258c9be41f710f955ca9e7474e5df..5b80addf5201e39484c12b4336fb2368c68d58f8 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 78c468e6eb95ab5ce009e01e247583cc6d313c25..1fd3a63bc349121f16ab16184faf2b3e5db2e555 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 0beffb221677214a31dd9317c4f960f0e213e771..ef799009422907859f305eb762b4fd118f3b9742 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 086ecce32a43f629b7336016a3fb94aade675a34..1b4d90ce1e3cb7abc4b4e2cba685011f2a4c9393 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 b4ba972b354421d12c1758c18085edaae414a0bc..ebf28813bcad8276883ffd3af22ab6ad96f64bff 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 22a04a0bf3fe37e8735ebcbbbf55b97a74a9d094..0e5bc1dd95a46fa65b3c27b495d9c5ba5f588e03 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 28448cede5ba4f938307f6d84e004e16022cc1b1..b8dfc534e7c531ecccfecc33c14d42f87cc18a2e 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 9f5d065d52637aee1f99425bb5ce9b6358205f62..b1b5e69f733ebe5f9a3698924b7c32ec694b11bf 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 84ef3ec9f581dfb83b9b513399e614bd6c809555..38bce017dcac3c937f424a0e04e8ec039766f3b1 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 5e897817fc48e68406a872bd1272b68c1dba865c..b9375a7a903d1aa9145278b7f0bf6a7d14684721 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 60d565324925876babea911fc8979add2c8790a9..d6e3bcf0ec7fa77eedb49377a86eb0218016b1b7 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 ad90a33b7c728f00752e6b21173665adc6110652..99c809d994d1fbb530e786eaefbed8a042b3e09e 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 ce7c2a32f89f16c1aaedf426bd39101b5901085e..dd0b4d11215a73eaf0b770cbd821069c48cd62a3 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 9b6c27edd9765299aea91bc3cdb4fc8ff1f75a29..f37fa2cd216121a454852ea5180c833b99ae9f06 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 5cdb2f973d471b677770721224f80318c489ca23..55adba3c217341f56461492497e702a085b336b5 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 463540e33bda3cb7df773c992aeee9ba59e8e750..8a1c6365d2719190fde558e5db441f8dc235e079 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 fe3c17869acba6cc79ab99b18c02bfed2e0c8d5e..b3ade7f0638e1e5cbc832240ee79a8c868ebc249 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 1d558ebbd0a40734436a9fc8be2f66d3c54dcaf7..71e64ba2b43aec31e2673d1581aae300be64fc1d 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 51ab8065894681e02f29542b63efeb4c44646769..b0dba705b8d3055e27376b4060a391e50c9e4f51 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 7eeb99c570fe6f8495f4276177360658ec9b7a1f..87a15b06c2610d76923de6209ab58ed027d08998 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 464d2dae58aaeca56d2086475147beacba5a0d05..143b5163cc36a9baff553f8f15918bbd59db39d0 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 d932b04aca5c5e91e8bdcbbe1ac506e3dc50b4f6..e6356b1560fa538111173148065edc291655b9cf 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 6b19f214e41f878e42ab3d05b589870a534e7504..b448ba3e8f796cbc265f6b4f4c35f00744a11997 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 b866a28851e9d78dcf03f6fbe698e03b38c985ea..8f50cee66809a09aa2f72ae46893bd46d574c66a 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 196b543b06c249f2993a00fcbf2ff1aede9bded8..ab98e21102f755a834bb9357d8c25bdb16f4454e 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 6845f71d2003ba5029ee65734a1b4f07f1b29274..3c5aba762cab032ae0bd6da43185171cf2e7a2a5 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 0359dd57d2c667cc0e9062713b9730d6db65db93..6dedb846f27a22247a6dd1f143a7b3ca760ea932 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 d21b1ebdf7095e7e51f2040c1d8dbcc0c638656c..ee30db865ffd57c4a0954a479c90be4e05960370 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 76f9c809ec5158a5e6c44e2fb06c506e2fa9e94c..0e4378b024bcd6de0a944ebc4cdcec6caa122cac 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 99b7578b736d479bdd6d63a67d965eb95de0237d..38bf7bce504b9d2d1cd85802a52d5894059df8fe 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 f25cc10ae5e9110bc3de45ae4db16ec7f2cdf5fb..03ed42be29e200242815d7e815e4bdf51571d325 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 784ab2d533d2db1b60561489591a144f1e56faab..13b48ce81b5e7e2e9bf02d8740a6d5b911e8356a 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 323b2ac811f596558e7ce30b12d5db1ecb3703a7..dcb755cff5405210b99fa8172f57449df87b3274 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 520f88c87236119ad045f47340dd5d130208049e..aedc96b90be8578386a5e8f78a06e6bcc9a2f7ac 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 bdd52e45479da062faa2788751b275d6395c608c..416ced84d2144a75c7914e7fb58fab3365d45538 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 550602e12a2047e4b52f5603f6e654c6dbc30b8a..13caca7d581963d889564a23c72ebc32e148127c 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 ddf076a612c84e9807b4b8353f9ae031d8a530e2..81237d70c9d34d0dec1da907ff5fe423e009c06f 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 c24be60713faa26070afd43630faec3fc8586756..c47f9a2ef560d864cde3303f1b7405b3dfdae030 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 f52a7bed42569611a73c0496216a7e9b74b21ef2..1f090ca3da69d45663f891a108c206faf77ca2d0 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 f6ef2258eb87f6069195789401f9277e4322582b..226766f59dfb460940a9bf1fb9f23207c38da6f6 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 9cac664927508aad36f0be326d684edc3ea23ba4..3a8c5c75041073d346d30373f1fe7ad3e18854a2 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 7ac54f99f7e65a7d19f78582e76d8b39a9519131..f97ce165ff04e46262df0516e4b56570c77e68e4 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 f585f4d689d2c639bdecbd0096da30b74d574c3b..4d21380941a4ab65a916c62d54ecc4cee55bba27 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 58e5c8abb425a325afed1c8051b6fa73273bfa32..f81bf418c8cef93c06e62f00104158afd3bee33c 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 3d546cba6b5948ab64298abf16a3bf5f4f0f3cd1..b9b4356df25c162dc883daf74dca5d670428d1f6 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 3cbc129a6d7bb275dc3932f8fd4fd000eda6e960..9ff13666a304ae56cb48a362aeaeb6129e183ac4 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 89d6747afac7e7c8163526555fe8257d5e1bc3cd..c14022be364b2769d4bc4fff6ae11f6e7b1a06d5 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 793411ec8fd5b73d6f81faab2269e877f2c6af72..3d119982e4230a9e164706d506cfcf2e4576cbf8 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 5bcbfd7866421359e8a13cae5e1fd34dbba04e0a..1da48f72c3a1227b5d9a50aaf6b98587ab9bfc2d 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 da6287dc967454435bb3a0ac47f79421b4eea263..acb8af7f5e417d6d425018726acbf49d612ce57c 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 afba77d0bfc14f1236471b6c5948559225b25a96..463964e978bacc4a41dbfb74b1abba1ce9962066 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 849f9948b7f7a1dcfe8c7f44fd725bb9e610523c..2895a2b803e25214f4fbecaf4d359451e28cdef6 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 f634e5c43ee8e16d6e294f93e1e7bd0ca068ef34..1722ee389fe7c94aeb29822cfda2e349e6d6b5da 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 22535d6ce0d1ed5af40a91ebf6e36b82253a2dc3..69b23c416bbdd6999727022aa1a688ffe09b57f4 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 88ed7528715cf75f2e5d6d1501b2243bc19271c8..1aee6d8e8aa6d8a10c5e6f0c4f54a1ee96dc8d14 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 76761f84736c3ff55a38443b51c661f5de24f35c..fcb687497368a4aab0ea0a44244310d91eedbf88 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 f0604fe1133f9ce6cdc8c3cb28794977d2f52f2c..1a04acb001713bf231fa04ef6b80fb0a35aab3d7 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 17bced07377c866b5d0444feb192203ac193631c..3c155926a91ce0071ba5f69b6190d0f7a34e14da 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 e118b7dd5b03acb32252fffb2ae4d2a652cef21c..dd857e5330227674176ca9a18edef1e361ac0b79 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 7c8ce54374ef5fc1af7af332d5a72029bf459215..7fc4b6d3bc768af5598e898fbc38f3b7bd9a43eb 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 f3124ecc0e7135b1e9d824d014320c90eb146c6d..4b2fafaca212e87a7b633e31c4cf94c5ccd6c3f3 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 2a4014dc7f621da8a4c2266eb0e947786aedae77..8d2e652986c1603940597fcde8e1cfb84e289d29 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 f1832672ed9e8ade75a490b9221e5388f2793270..023e94ec8db37bc818a631ca7af87ecc6edaee45 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 08ab2b8fef9953063233734512ec261944cf3bc3..b75902a667cb068f20391595cd2b8fad349d68f7 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 b6f7ada30750a0f7015f41dea95afc8f5e3f3a10..1a8c3c30ca0a0d383809c2f4e8d834436b8d8f78 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 c4fecb9ad62a20be69c8aee000ea80f54fba634b..91fc08f3b4a1c6f56d5a1bb5dd88c1264228b06b 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 379be5e5784be081a4c4fbc398ee397c389cb0e5..515c00149a5b3f29f75db7d84557da4eb23a4348 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 2d2a43954da4c9512a2847cab8c945731bceda9d..5d89fd0905cdef491f60e982a2b4ed3e351d734d 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 745e32e36d7b40383ff95659e27f2266e96fdb96..c983ad3ddecb78d355286d2ebf85191841e3b406 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 b90d22a83b34f15014f8c53939e5a7ca8a2736ed..2008a9c538544a85b27ffbc53b7979b896c0dd2a 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 96b89ab513be4fced77ab266aa7b2a55a2421fb6..1102db16a6397d0019d361d4d89148fa9a66f150 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 3c8151554a4444ade308e63369ae167fa09cab9d..6976dc57cd8a28c909bea3268feba32c9a835145 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 6d82caa33608ac5dd71541ed36cded021f6f8fed..81cdd64deae0a4344017d8127c72106baf81f9bf 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 0cb3453ee0cb3199e17d2c25d7f80969562f6f5a..5a626465c110223b3548da152d87aa004431f4c2 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 40b1ba9a3de49ae1eae89a508bce57a3738d77fc..d86b6c94ccda7f01d9393e94a21225122a10c76a 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 07613910f2896cfa3acbb92368de4e1a553e8420..a2217849574a4b48dc1f47a23b14b57a8b96558a 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 e435a383a4ab2754cb7f343dd2dd684c7fb5e6e6..4013962078e71c8d23d73bade1044cc352a749d1 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 dae2d68ad5a6b1d127c1cfa98e84ef2b27a86f09..27f3690c24ec36f96e71c275683ad3e587637c97 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 b7c5f26bd7f1422c71afbac1256037834b8be34c..b0b0c046a9cd83e8aa3e93b639dbf9bf112528a7 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 cbfaad7390e4af07a91555a4a0511ca7c28d9dde..50b04d89b7bd4ef5207419e35ad3070f3d8945c6 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 5772d78948bab377dc5f028e1310541ae76ed302..63fcf173229f199d6f3ca0032d5ed881be4f31bd 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 7f00191450de32d6211ae2e0ffb5b999acb5567f..4b07a37a967d1bda95b9eb95236183cc62521f8e 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 b30c8c73da3abdfc5933b2164bbc0a6e7e926f08..3e6e52174b5ae536f09bc0ab57d768e88f004568 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 3bbc43b170680b7fa586706277c1013e681e5fd8..d7d68c58919066ff00e658c4543982340560a126 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 fb1c60fd8f43fb15f22982f1ae9795138de0397b..ddb7696dd62f91ef1fb2e04521ee18776f835657 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 e7a2603ec003f67c421eefc0a07bccfaa0cf2c1c..9052b9837331a76682135cef04732011e578baf0 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 9ff1178bcaaf3d8e77694dced85ba37fe094e78b..96765d603a1f60bd672b17aa59916e37109e443a 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 01c155451333e717a136d6d4a9d10298421ad28c..5c5817a597404360ee5024db9f0075406bc428ed 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 899daae7b85f2008e482ce29bfdb7f0f13797e35..4f470ea22ef66c68e3600f58d2a161a784345b99 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 a5d66c554b9fc0dfb3323c3e151d981f42cb7eb1..ca1dd968d1f5efa82db07698ce61d3ade93d6abd 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 5cf0c146f4cfc29ba01b871332519f907ce98faf..83a22d0e7496ca9ff2085fc415169b85efbba08d 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 c72e58e35802ff73845d491ff086b38c5a482395..bb8fe9b3d8872b5ac56a945bb0229b2d9e82c725 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 5a9f6e1dbcac426727447b1a2ac1da274bbcb753..1ce99ac3eeb36b626864f0ef48c8abf0069565bb 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 27a8d30920dc0e276be4f4f546ee32ef851cbcd4..a6167edfc4af6aa87575adea7adbe9fb392376cc 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 f962566801caa4fb21e54f86d395614b8f6b7553..7d1ab1893be40014dd8dfe091efd7b7cdab17c8a 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 8824a45d6e543793b50d09ff5a4601449f8d3764..87cc40652c66daf8e035ac725a25e389f0896943 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 bbb84da91ea74a69709d93bcee98a83f53ad1ea0..c05283082ae847594d9d161d2fc0f1b9fd870880 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 3b4b5b843ebbdc0c47ac0b1cc743f4ce99d55804..67b9cef09cb33c469e6d3e25d5b95d01ba61156e 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 093e892a0eac62afd5f4b2cb1d1c69a99b30ae4a..7a78ecd8d7687ad2bb17bb962640d5397adefed9 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 8255949ff57c07d443a30caf890c355804e0f262..8fc3b4dd7619da0a0bfcd515d399083da68e3752 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 cfb03c7c1f52f0a3d04768d8e2de10642925d571..d0be98aca14dddd5842b4079383a8b58247f3598 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 61911b93907508027b804f3a43f4b97bb62fba3d..263d392555b4b3a7260cc897a2b979b60e4a18e8 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 ca6ba13a56ef287522d94551e9fb90d8956a6be4..e807b8e718fc09e5272df770947799f8e2d17fc2 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 a25e99d077c2ec40800bda705c8bb9b7b2a2e5a7..6c2716e250353b06c265c3683d81209fe663e9fe 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 f51bd52aa09059502ceeb9ddd36071dc4446dcef..b44471bebddf3af60cc93cbbc66aa7a0cabcba1b 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 3d96caad04af191ca6162fe2c95874feea0ae078..839ab0a556537978cbc7eee923d08f3da92f2ee7 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 63cc1849a1d680774fe6d190b7da0e06bc3718fc..bae54d87b135069291033199ecb68226b83c10fb 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 be4ec66f21d0b82901fa523009f2993951404a8d..0f8665ba2a7c849be842c3ade1bc90753987aa51 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 08b33707cca5228b0b3e276adb5fe992b12c7756..e9e0e6337abaec12961e862e8603eca1e783acc0 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 8c3777246f77f811f86eaf11ffdf3415b9ad501c..51655a60f4d1505ebdea43b1be907c7ded05f02a 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 7e1a9169d8ee2fad1ee0abce542f52e422ef05ee..adce161631a4604920e549d51f9a99bae1fbe57e 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 fa4dc3b632a9be9ff1fd8fc4b084f4910ea9d52f..8746288187819248925e64827656263d5bf5b41e 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 d848c6ba85fbe2569dbae9c47e6df96060db7913..a863269ffc7bc67784567feb186a76abd55171d6 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 d59a0294cafe47db764f11e171cc102e16a47276..803cfa65d4aa670bddf26b49233e7f4c771dbf74 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 8adf670b156a103ef00da31bfc7001de3f42310f..f5b1be6fdb8f9ecbcf42d60ffc1a78d89ba64a7a 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 6e77f747697320efecc01401c755234ccfb6b856..b04be60f60f9b058fb9c33dff3b0b4aeeaa1cd84 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 e30031881f6a6e2e466950f4f1f853726f342093..ad3b4a830fdca57b495f48f76a6a684a64eaef5f 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 a7660bfce525e2aa6763403a4a961bf31106cac0..4745a6938c6a4fd35ab996a46f76682ba6479e38 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 d21857936f20dc30079cdba541718ede0f5394ce..f3bafce1ed7e977b818520dbb5bc87878ebd63ec 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 b23139becece95529069d3987157a20e615c4ab4..7e94a0a18645907a1d71d65c84d6482d72d4e1f1 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 cfcdfc4e866b12dfeba34986ece0c96d1b49b8d4..e05248a1c1c5bbca05a6a635150e8951cd4e9663 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 e7c2f8aa809bca00b838d3c129c8103596a745ed..a5bc096aa87f485050bea44bb9520a77f91dfea9 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 d933646a930e255b8db043b35bee0016ed5db47e..e2cece0e7d47cb3705214a0c52104cbe09b4da81 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 7e342ac3c75310e97c7b4a5dcb00dfa71a11faff..7bc4705fcd898f6b736b4f10d5be59ff058df0d7 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 1a77dfc899bedde081c60419e8d4777801992362..07ca0e16605c9b1e529ce352f80629683bd23477 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 950989f21fdc699c73620f26bce6e9281204029f..4cc47c3da47f0676bcbf3603b9e984e0f42c5d92 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 9633a1f73615e5b01a1c4cd7967de58b9b26e336..b1c22de9a4f351e06f395dc99d7a031dd814ffe0 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 07c2de449b87a9a1d63dc1bb51f9656d9e8322db..87ca15cf41a2b2731ad05a7769ef3cede3215614 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 a1e71a36503816898fd250743bc1e41706b52b0a..ae3dc096242e1acc9597f1b57b3635b05f13fc3f 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 570d5f407d40cf33edf26c26e4bbba84442fc1df..567c2a710f1e46cfd6faf52042d0b9fc0f78bb46 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 0583c5b0e00dc6ef6cde2918b6e33432339c9b84..e16f3cc56bb2c5ea5ebc553d8eab80fa46ae38a2 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 4e04e56decfaee166b2cddbab81c0c30460c8d37..efc711acfa0832f4a5fbf1ccfffa1547dc7effd6 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 6c091ec1b11277417144fb915d553358ac798697..10b41426740dc69f6039a0c19c2d8fd509c20d14 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 cfdee3332f693b553291698da635edeffe7fca61..58bd2894afd60d5109c0e991fe23c04354d0e5e6 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 291f68033cd9d8223097de717e68134c924801a8..a5b375682ba8dad7629bf2eba754172ff1ea5092 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 cce100b357d82d599d83842e1ffffe59e5aac9e3..dfba28fec2a902ee5d282758ed0180e04e875480 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 7fb505d8ef12f0be90cb14a242a95568a2b7b393..3c58b1cacd0c1c6f030d8c686e9b230b6d582634 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 26424fdc51fc7ca385d49d0a2a86198205c97782..2df9164ec175d943489d68c9dfd03ba3f57693dd 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 f2bf1893ce093c99461ccd1d96eba06ae2e4a3e3..96ce751648749af79d9b978b0ab8a15a796b5b89 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 de5b242153f130e1d3dfd921916c140c1366d793..63d0ad8d534d4dc22a127fa9cb372fac2caf508e 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 92b656239ab07ded37193b5731b00cc552c03c89..a67c4aba3fe137843905fbc4af4e8c911cc541e9 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 2c5cc5ca7d90c5436b05dc5aa4d33731d26f4c51..a859a9e6ba6f6df4bd05367cdef13ff1f6acf826 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 427a04275e97c3b0e71e8b0ab2be48f48b5b1b93..2ffae121421c7abb302eeadb34acc31189e427ba 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 d84c3f214f964a9d2e5ab2bc5598d01a8e1698ea..9dafdd14f746a21211f4eefbaaef21be8dc59e16 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 e1d5a1f422a0e16b2409ca5c71af3d23b2e97382..e73513821c03bc5b38301f636b460cf6479ec602 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 1fc12d07834280c8f3410d82eab4a6101abed19b..068dca4258ee1f7ac56f61ce705e5376b6203e9f 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 cecc6f71270b071d1e22ea0e189cba0ba2dcbd90..20b80d5c66ab9a1f4e96ea58b135c95d0b1d72f6 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 979508d7d495ca010b2590e429218d64743ef353..70a39dfebc623b1e48cf52f04f759eef15db1ffa 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 58e941d911fc96fca712530f8e3e750e7f14b23d..6bcc2af1b13c01fb1d656449a17cf308a55b920f 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 b2191bebc24a757b2c89908ef14382039a90431c..0dfe8172843d0cf7f8a33ae1e20af4007ce19ffb 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 066ba9a81696cc469e6ac236ce477ca4881f51f3..4b7ae33479284f0f242f5f7d505e8213af7b292c 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 454eceb39e48655e8fb259e1a2161196dd461b8a..883d2089b25d0ea6cea817e2e314b1169e0816e4 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 c2b5ddc3e34244ef25635e76e810ff88f7dbeae1..ad6762b9cba1d0cf5f34d7b53c28216511d2a38c 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 131865a9613747a80a83d43a316bba35d8486183..1ad97ca6c87e0947520f2e4535f22d705fc2e812 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 718734365918b5479e53531f160e555f6e6fcc43..fe26b9aae6a6f04f4cc021c01aabe29225d10989 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 86678735ff2c3c1efadeffd5fa7dc3be3e6ebdf5..d672a41e4f0032ed642ed4ca35169b9353138c57 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 8664725d417f7f90f368d8cc36f935d742c7d1c1..f62879c4806137b24f3e22df3150f63439645687 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 0d6d5d71abc5c23ecac39435654d927e62155f8b..2863d9a3532214f42835c7fe2cb71a3df88ffab0 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 50f721474c7bcc958fba6ccf20a62a290770ceb3..944cca2f7c30a37bb492aa59ca229340ef5eacd1 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 2549c72c5ee2f15b41f43b0132df2c724bd0ae39..fda739d05914331338ae336d978820004f033036 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 1af08e54e036e6f208b10b2f7c9d147c7138634d..8cae431f33db801531853c09530d34434ba8713a 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 2aa01b941129b16550775522594e1d2a223d565f..9ebaac8f1e636aa6768c7a38e01e220576e0ea84 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 6b8e9bca5f97e3ebac7a3819890b6320fec9c280..e032fd5f48efae04de5e3d5392ad26d8c24f504a 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 d8291672f4dae68e138bc9504e19cabc30ee13ff..7655a57c1e52fa73e899cebbf858c8eac811b4ff 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 be34128b96329e29fcbad9802bfa7cae2a2c145c..ceaa717a488f7ebe1dc5b136919c08ae68307efd 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 a33e7bec38f282c1460b39ce985ba2a950fe2280..e1a8a8b2c87bff13acd72915e62b52e2676648aa 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 cc335ae4a4627a5c9d4c4a4c4365e820ea856075..fbf3ac6ad6af5bba4685410ee29a87f3f033be0d 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 1377cb7766fb69c86246cfe02a9e8ba698a78c33..e748f2dbe0afd5b00a89faf4efe1b7c2c8ed10af 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 b2b536a97b0d9e1e7f9ebbdc336197a5d791e311..7a41337168f790076b259d18bd9e3f5618d621a2 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 5d34e82c422b294667652bbacc3599df9eed53a2..68e18fe6e40021d4ef7a776dd18a344b6deb8f5a 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 f0bc9951fc00b11e07aa1831fd5bedacf72dba6b..046441d153e4587529cd2eb7f98afe190ae80d48 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 8822735b5d42ed66b55efde5491281613d913b6b..0b59319af67ebd148390b956d366e6915a27896a 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 13b46a3bba5b71a7bb5955d1409b30e3fd32ac9f..41b1716b5f3529891f6e2061d6672f5dbf6ea331 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 fb17bfba9c26bdaa637186dec4d6ccfde3ad28cf..f6944cbfe9c676b0c247106954a59605683b4603 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 cc6402b102e839a4998e0100d550ee11c39eeee6..0f410d5f7bc429061c9a9248a2bca46d66d1f751 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 d5d6c3441c79b17f3a11aee9839e7732ebab67ae..be4e53c3c2d3ba8c2dd46fcfa727b4e643033a01 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 e02c0d7df0fdc530dc4dddd4fdef7b2e2c802f87..1055b0ba5fbcff33dc7fab27a484ab6ad868e47d 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 58488e70263011464c916dac6d6f6c0a776924c8..bf652bc41bed1e2dd9cd5dc24182be7865b133cf 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 2463363431eabb8ace617f922695b5baf2eb114a..f5eef1c5cbb98925619358dc93b9055c8c1c747a 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 502dd1e6940a9c20a98829c7860aa11670ac5302..8a3c4c6b3e5dd667e1d0420263ff0610a92f31cc 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 e5c960b9575739b01d9085ddb0db699670faea67..09e7eee30607b09e2f97a0c7871bdb223d41041c 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 60ac3d8df1ff7d89ee6f6be30d7f0cdcb65ca8f0..7ec853951ba1c08bb46c9ea90e728c57df962f3f 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 f86fe0a55b7b8691926027a5529cfe7714354310..03f58939baadd79960443ae2ac0c64b734450232 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 0e46fa7ee3043395763445ef482f544e7b4e32ee..b88c4fc6b69d8c0c53fde4b4a8a1d7b867b901e9 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 8948c6074f2399b29d69fe940c4a798091ed2694..cd9146ad21394ecd0c26fb9c3a77f0d33670722e 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 402a5551d9f2b5a62608d801a4cac44aae7b55cd..f28a3b1dc7ce4f2f08fde5f5210063660d1571c8 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 d8ad38b53096b78f8039b8487b71e59b664c2697..bf5e0f4b4c55101c734dc37152a616cc965b15b3 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 66098380284b4ae52bd383c3563c22b42439446d..2d715bf6b1fffd9c432fbfbcc0b8695fd45271ee 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 5002679f4ac486a19d8f6c778e3f33be28599e9a..afa6da9879b30d5cecf9ea67e0a622cb630c5e7f 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 b1581172dacc22dc9df65a141592c424573b2ac5..66a9849202a701f3ff5be095c4986b90fab7b340 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 68cf9267f170355c541d90f2a7de477d7156ae36..0ffbd670d046fce6d82019d4a29092b3e3db3bcc 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 820832e245a039016379631a84cdcb93a600d4f6..b2ac3f11ca25af617c09817df736abc16ff79a26 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 eac6a597e5bfa0b8b274d6c763b7bc57fe4c707e..0cd25ef66edb650e5d17d9551165974bc26f034d 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 8d8fc257c3bed246bd1c3341a9d11641dc229d0a..949eeec65b545ef2580cdb168f19d0b404e7a796 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 32285d64392e555e122930555b2fcaf8b7872102..b60fd111d2294be0c005b94759d5bcc46c28764e 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 bb15061ea1f838bbad5f0035b4f47a23f7698b71..38d758f14f717e32b79b12d856af843e1a4a1c56 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 545ba3c1ddf3fd248fce37d7b0ff3f482431967a..c19978c8900dcd50af0d7812e2d7c3725761d930 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 1a985918f5f6bf62e1e4810e59fab5a46af7cab4..dec06f6535b16d885c4e13d585aaae6de8f34249 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 4d76d9af565731bacd62198dd1575fe4e254cffe..f3006a57927188b3f85f80923fb98f9e8b53738a 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 27bab55784a12ae9f7e258ec014706461f79fabf..7137ba8e6a33041015c4b51ec3c7b9e25a561913 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 7190d5a422050702dce8267bd0879a6eff157236..6e7787803be2ae8338190c963692750055b81d87 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 937ac89533d01e9a19d4b1d56a26df8f58d070b8..ddd8f04f73bba89030cf681be78d747a11eb99eb 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 142070a249e7a548ca1ed06bf72f093e86a90f55..0ae956c25a328cb5c8df0551fd05f21e93818817 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 f99c331aa04706673bb79dbf68cc9ab0c3e4033a..f7a64c1cfbba3e23e7bfcf42eebf90aeb2eec9bb 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 54f09e526eebcc5610738edc53569dd4b6834427..3eec89472575b1c9e6750a33bf5c7370e98d5bb3 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 80b573195c3cb0ff1341da4cac035d0adb198b30..ac62450b787c91f427655d4e0e9cc39f0912bfa7 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 8d6265a1dc92d1e16d8b91b75048e5b9319516fa..bdfc5ccdf56bc9f72fe225b6ecfc279c0b57af93 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 7d6ae6f4f6e547d276ecd7f300eabd360ce7f245..20a29c0044d22c662e3aa252690f41e36c6bb037 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 a31bff7c353d647fa7ef073d29b7eaccbc483fe6..9eac1e6688d89335b4823edc613dbef65c9b1078 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 4aadaf5ad7bedb71a22b0f75514fe70773d0adf1..c3205c7f8142703dfb6c29dad2f9cdc642618424 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 21d9d8db930c55374f72bccf5d236ddb840ddb06..9e0707f7dd6e0000662615dd329441076d8246f8 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 55e736dec25f3675b6b227fb38f078e3fd326add..81a06e6142f1c66256fad8ab548fc59d58f25c08 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 a276dac48f6010b140f1f0d9c738bb8501591988..e38b5868173f39743cb2287dd736d6aa22a9c770 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 87ab7c4f1aacf235c77821d1b32a90ec2b6dbfb1..efe4e2855863071d4254afd461fba07f1d3d6d57 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 1c1b432daa4491525d6cc5b8cedbd3441401ccc0..f211422ad7124d753059d1dfa7c0931ad2cf69c6 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 48bb929c2b1dd1a6e006ba3a33468eca11b0088e..a9cce1911013cb2651169f5832cdb69cb26e1fa1 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 bd5079d306eef42532ed72cc888b417aaf4d7ead..0bf6fce99153179647767bc00970affd9a1876d3 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 fa8770a0677878ecf6a06212a8e03564d9e068ca..b67be5354091faf84ad892abb38ce6b3b4055ed1 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 00eafeb9705d10e6797b42dad5407f0aa67d7229..5f224fa2ff8ec828d1082c518b3d029f6c289ba2 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 aa3c24ce52e0d72bebec3b9ee3ccbccee219428c..bf7c50df7619e0f071a5ac9df3e9a9cc3a71f729 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 dd1b62e9a61cbfe7b93abf7b577754db91e9ebe4..0f41961e4953d11047afe568fd9a3a924e7fc1f7 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 0b8a81102fe5696bcd32ccd5f31e5e9927260520..e3753c67be93a108147b4b21b92de22f8da7ff54 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 b28977cd6d92acd450677916c4f84bbc6285685f..fe8b6b588befd98c09dccecd91b70e6f4ccba3a6 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 89cc9932eb3c437bc7faf7ffffd57a0261eecb86..588137b7dfa8bb797603be2df3e95bdb2730ffa8 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 b8838cd9d4001fc811158b255b044a00f64dfee4..c486d08a6c95e34cae4dd06cf63078b404350bbb 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 fb483cf97fee398df9665d4f483bed4367c8ec21..9ca1f6f2bb8e210aa1e0f05d6cc9ed1f9729df92 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 a3ca395808dad606f9c76cbf493764191f03ef0b..aecb4f7ab69c0b95de79a4c4413cc0ea0d8735c6 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 c133e6520a2f402b5a07d9e62a53a97664810280..a5598703bf1e222d8db37514836566c0f7653f9a 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 6bfbf8f1cffcbe34267552fda4102494d4bf5907..4d1f9c3fd3ee5d3d0d8b48cb31de3e044276c922 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 146ba3cbb0dd69e44794f89a72ad5de7dbe60287..e97ee0e2123cbc1fe65f672e5ac488800e829a17 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 4be08ef184d11bdff571d53114563d709cc6fe4d..cf52fd7954b2e97be3f09a8202694b80d44bf291 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 e05321b818de859bd67c841cb011a8cf6cfc7cd2..0fdc03e3271b2914d29fea83c4b333db8085b24c 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 7db835cd80fdcd57b0f669dbf4c68f41bd5d2c03..9090aa8a44b8a01e35182f03bc2284d417fdce6f 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 5902f2a3bff4d365eb990f5341ddb8d48bdda0db..bf0f78b4956dcb3300bd14a926701476da741411 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 f021bc7dd8ec6c2247d71cdcb2b0ef81b7fafa58..ba9205b2ff60fa2ab07f4c4a80a912bb81fc5bb1 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 38a1b867a98dfd2ecf0ec2d317d4767ccbdceb01..6405b469ab98a0ff0373ee49cd54ee39e81836b7 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 fb5827e5451b5bd89bbcd20bdb87aa71d258c941..98b5945046ced73b4d55626a5c6027597e337ec5 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 1062c65470afc93a72253b1658b51fc28e13b156..e7a3fb9aaad37bf1a60eeeea914203ba6f193e8f 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 a750bd9c4808c0603c3e82c291a1fbb8a7266d3d..c7a47b1a8301b14700f302bc3846105262dfdae6 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 a5cd207a1b666e555206e29bec6ae722238d47d5..72c0a5fd12d6eb12dc587562de25895c7ea9746c 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 ff6666bcf6f01a485424d2a7f1500ed691be9de8..79613bd45e3cbc713f030d769ef223d891a38062 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 3651051a5a76d3045902d620c8dbb7b9d630c189..2213e9570b13e493c747116cadf31edb12af6d3d 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 cbbe087c9d758c4bb34f53daef4a91a6e17074e4..1a71931b581751444078144edb6f700b7f2beb72 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 7986c1c79fc4fc0e47243f248435ab2cc1acbdc4..ea747db89498d1761d12fd3c239fc980c683ffd1 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 a4917a8e724a49081d31809ec0a5f9d95e009285..bbe8f908a5722ef6709f9830e59a6b76cca366cc 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 e356d61233494de36ec00edd3336b60111198c7b..b517df3f3d4f041fdfdf9cabd939284c1250a20c 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 0a809496710635171359675891d6f88a4ac6e631..86b26cd749e35eb0f790418b203143310e717965 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 1c84fdafcb9f73e399cea03f77cb0079f2fc6154..9b232a5b0f39e6e020bf43a20ead39532a308d4f 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 90c3fb2361a9c56fb2801046e0e171481626f3fe..54a4c222552c49321b8d021c24e7ea98448ee50e 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 021b12f7a758d27c11e98ad0af16eb61df0eb3b5..6147d50ccdfae93b8739caa8785a261eae2f8449 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 24fa1920623108ef53b402ec4b9acbb24822fb18..34e2a94052248267bca8033c32efa3370779e01e 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 9e38461a154a812576e3a54431ebdbad1f29253a..e09d6de1c745b96bda8a85a3207b1acb909e37b6 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 34beb65c3edadfef7dbf944e3ff09fe9df734fdd..78c78068ac8b9ff0f9b126040e96b7ca3c33cdf7 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 20641a7d761fa3c0cc2f4d338fd7ffaba4d08457..5be0fee2be0da49e5cd094c2c5a878624c02a567 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/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index 9719ce6333ab4907816b78e396611c4d8ff5cc9b..ae1c43d6d4af3e9a01e51e2a4f9bf488d55551b9 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 />')
 
diff --git a/lib/refrepo/valid/input/schemas/schema-node.yaml b/lib/refrepo/valid/input/schemas/schema-node.yaml
index 39311f47d5652316de3132d88d1dd26a501c9157..65bfb47b788696e5f6ea1e319ef91ff14ad01f06 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