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 4d33f00b75e585dd925979cc567c58c9a524e712..1898fce40a80b1bbbea26306d992c01ad020c22b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 02619c6fc1d56b1396f29e283a578c3ff83a8bdf..873aea8caa8b2a0507dafb54cc27cd76664e3e34 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 72c220ab8a2105fd1250fb1182d7b56c4446effa..e5f3c4ce39e2fcfaecd43efc6931b6e959c5eb2b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 adec85bc265498687b8726a4f50bb510c5ac26da..2b61e2cf20a6b6a8a83923551b44962df51d4b06 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 97d26b6f36ac0f7a2c174881f3a2ba57aa8d4119..5c4eaf0deeb7e336d76413d08b5422744478561e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 624497bc65c56cf3958cd3c71ab546fb3d662cef..cc128d980890c4c28e1785938c5f859c5fc4fea5 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 cdcc5dbbbfed88c2977d74667e82bd19f6662936..b5804c8af96d9f81efda54119e223fc1b28b3c4a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 1f60298424d0c021a64766d05f6590cb6cf7b5b4..116ba259b3758d2881e49f350788c0360c388957 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 33d67562f340c0af49fa4e26baadf45c4bf660ea..7352a262e2e3aa785f2eacea4501be4be175bc13 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 477051bb208c4f4ab2b0238d399d1c3237aeb78f..bd3bc98cc9707afd6ed5bec346011750b076bfa1 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 aff44e3a4c945a6eec40bba2b5d9b7c3c40e2617..cfa2ccbd29acb6476bedb36655522920c52b4589 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 203691f4d4574def3296dffa0be81a720c7e4ce3..2cf94d519f97cde38afecba5cc992d91ffe7fcde 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 7cdc228a1abbda430a53e5bf0a74c4d5ab178653..05392d25c50f051bfe37c7fe05a7d84966cf3b35 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 4aff0a2c7fadcff87a76216aa9e03368b8638aac..39646637025901e6bdd8b4c8af3223a95786b4e9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 879b1ec523fcc1bbff218aa66ee51842d51e3567..bd235bdb8f8cff78140aabd6076cde2e5b1eea5d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 d74403be952f0c5c6712962e209124dfd5119229..0daee67c0253382285bc927e34cc5441c3e124f0 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 fa67ba70f58a4ca28c3988407a44ebe7b543a6f7..06b342b5c6994aea4e7298d4f23a863a7025ce2d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 cda4b55174fd43b5bc954d2fa5df87a18d653ad2..ec086ed765672692fc2d91cdc448b36e20c69804 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 ec672fc6bdb34992d5837ccc727c468cf47fe9d2..56e2f7953f0977ce888a65b98be345fd58c567e4 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 e56fa4903238c05e1f6ac950f1ed35aff4257abd..0ac1462ade1fe029d04eb1612123daeb2293e47b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 7770862003950456d443b887a8c03275d716474c..d6e410b435bf10b83321bf8a309961b7b724ccb6 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 042ac6c9b8b6fce989722a0318aad5d9fb0663ef..ac6f4b8259bb5e33e32017ca82e03f74e04e7083 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 6cb3f457868de464b22c058b9e50bbde12cb6419..876cdbfd33b958d2506f8f8f01fe22231d507b30 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 2f2d16900401ca1aa05a80f9379e7af029c120ad..29f1abc60a59c1bf8fbf9e7311c45688aab5957a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 ae68da9cc5735983fd3109ccf90570530e8fb37b..01018d4f7cf14725d828b9a4c2856c529ae17608 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 c29958e619e74504b1be8612bab7e5c9c0a990cb..78c0458efb16590d0097dfd801bf2ba44af39f4e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 e377145b83018d26e21681a40b78f4cdf7bec607..a0ff2c30937d84398da0c24de068f84b99938e67 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 537fa1a0924326908c4ee469718ed3d05bd5516c..6925de1e424bd399dbbc2bdb956a9f0413ac3692 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 8205d18210c1c929643c43c0c966774c343d93e5..29f02db1e899243fc05f320f106f61d96fa48163 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 b55c872e9b3a2a82984b169babb88367221d0e63..90b23834f9a341fadf8f886d28efee2a76ab6ede 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 a088e7fe2569509c4cc38fb15a733a9be91bdc59..6ecb574a8aee6b5a29c88c2bd1b2f82167707ef1 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 9faa1fb3e53a0004157ccdd16f4fd8e4e5bb080f..cecf501591905070234c31151d18a63b3ed749b7 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
@@ -76,26 +76,26 @@ 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
+      id: disk0
       model: MZ7KM240HMHQ0D3
       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
+      id: disk1
       model: MZ7KM480HMHQ0D3
       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
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 b686b99819c608c71eef7fbaa0e680f04b71a1f3..765b6ff03796ba9a03c23ed20e03a171c814491d 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 fe809b612200b17721ff0d111d22c11c93c4508a..86ddd32d7c4c01c78a80eb3b3b663668060cdc16 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 2d816e20858a00140da433c255349786d1c6e9ac..0d7b8b9b0c9502bf77e8859354575b54615c3eac 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 e946f15ec23e3a347e7a3f53f74c126a47906ab0..3dac6aa43b56c4c6d3983dcbc557219a39d59937 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 81cce7370d05bcda41dbb3ac126cb481d78c6eac..75f50885ea2e95c45f48a3322c837b2459a52d6c 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 179996961603d053bf1acdc917acafef185bae6f..a588c19d19d844600ff6bfcb7ca00e2cef305737 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 84bc65f4ecb718ac22e28969aa18bac90ae0f8a1..305d90bf4052e274b22e65db6bc54278502f3325 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 d49745911a290cc52004967d0dd010937c3c0d77..cb84f705648bb66ade4924b56c0a3a56968fdad0 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 05a701eac83798b716c310c709b964d1de04a58d..ad38f6176a3b20cf47f87b88f72ad0d74b40cf26 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 f261d078877825f911cd0515530f23056be9f830..6865e814c40e7508cdf73f054ea5138e90b22680 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 2e25630cd6fd9557c1b75b90441b181002e10468..8219cc2f06795368171cc8183735194067e546e8 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 a01abbc11ba0022a4a9bc83d90270ed23de24d47..1c52ed4b0974cd1a0e7f8fb968cfcee251722dca 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
@@ -156,18 +156,18 @@ 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
+      id: disk0
       model: ST1000NX0313
       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
+      id: disk1
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
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 ce38b2cda027514566ec44fc229c18288de774ed..1dad4ac7315bd3a3fb832ff3431a9fb200a304ad 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
@@ -77,17 +77,17 @@ 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"
+      id: disk1
       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
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
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 0296a07e9cb775a164a850ee931617da1763c6de..fa2ec5b4adbb009a2c1dcb2bd210d00f2fd0856b 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
@@ -77,17 +77,17 @@ 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"
+      id: disk1
       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
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
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 bb2263c7b959b1129e2506ab62c96312e059898a..417ac01db5841160acffb2357b08b9053d82fa88 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
@@ -77,17 +77,17 @@ 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"
+      id: disk1
       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
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
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 975bd7971d9e745819e6f19bd4aac53dc5444ab3..0febf2f4953631e18cdfa3b660d6ca1200ff701f 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
@@ -77,17 +77,17 @@ 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"
+      id: disk1
       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
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
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 1eb9ac68765f7f1a4c97f9c87713a610d3904659..edc09e77308ea0f35f3d1ab16cf3dbb3021199da 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -94,48 +94,48 @@ 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"
+      id: disk4
       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"
+      id: disk5
       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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: ST2000NX0463
       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
+      id: disk2
       model: ST2000NX0463
       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
+      id: disk3
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
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 6482d092436a95373b5686e33d01a8f33759718a..a5bcbbdcef14b755e6497aa311695d01b65efbd8 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -94,48 +94,48 @@ 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"
+      id: disk4
       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"
+      id: disk5
       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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: ST2000NX0463
       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
+      id: disk2
       model: ST2000NX0463
       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
+      id: disk3
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
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 760d3284c7af4f879f0cc7150272d060470a5328..859eb3f6bef53b8bab836f3fdc8006e3f590db14 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -94,48 +94,48 @@ 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"
+      id: disk4
       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"
+      id: disk5
       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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST2000NX0463
       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
+      id: disk2
       model: ST2000NX0463
       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
+      id: disk3
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
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 8530c50229472e7f774a36cbcdd8bcaa2ad10931..842fff3ac979b109aba5d9076620f6978a7477d7 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -94,48 +94,48 @@ 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"
+      id: disk4
       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"
+      id: disk5
       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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: ST2000NX0463
       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
+      id: disk2
       model: ST2000NX0463
       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
+      id: disk3
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
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 d29869a51637e947b709bea94b6c0c561d38ace3..60b7dad50b600bd826d36d179394df937057302d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 136ee5c9dbd9c6b37647d8b684a157d9b17eefbd..be51c5326498d46a09a4274c4ba18ab2d45d95d4 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MP0036
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 06dc85572b7a505013da29b1a4adb88c798db3ee..519d7f1e0eefdb409f44ba00f2c205e0a920f4db 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 f9eedde050d97344451403be8276e084255440b2..805bd67815cad76ae1cdf10f44ef5fa9f042c59c 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 84ce0b45efea9bb2b5f1e582db45d252370ba1ab..6cb0bf7d188fef117b977f40c88d181ec015c2c3 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 1afab0aefe051661944b4b7f22c66a2ff7064a6f..c74192e285db668b99745e48ee0279b5bb50911f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 6a27f20db59098b4f1da9429ae64056c60eab74c..0d96e19baebba6f7f87607f102a3fdea968581ba 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 acee8ee13682518ab43d53f8daf1a2db91cba13f..0a0ccf7795cd8c0cc7ac6cf5c623c577c6e9eb91 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 88a31c67887f568296b95f54c12bf019be528717..a2da7b9feff7e1cd64aff39f2eb766019955b60d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 a0c04daae6012bacb016994d65231991e2bf4679..172136e497f39e7afb79c7012498d3e4d89dcc4a 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 6cf583951a7612f42d36ace9c275474f4a24e853..fddf80fd6144b6786b1dcdbeba50873167464bcb 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 1024f1e422ddc74f3572f66c90abc7ca2f3dbceb..c8ca8a1e70e5087afdd52b4f2c3007c69008bba4 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 5dee02fb78ebd2f29cb013f2babfc124fb65e9c4..6dc5cf4048fc8ef02d59611895cfffdc2a4e813d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 d097932110a5f2a8b5507d9c7da64373be1bb4c8..0e3d45ec79fc2638ddaafa5ffca6a6db7064b4f1 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 b44f69ccb9f93752ab96fcd469b12508446735a3..351af5b07cf1cda6ae1354d7434b162e25cf823f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST300MP0005
       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
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 2e1932f16c3fb706d098f64a6b58cf78f8763f80..c602e8f326e86a019a38f422c33deb99130c97b2 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
@@ -101,26 +101,26 @@ 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
+      id: disk0
       model: PX05SVB048Y
       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
+      id: disk1
       model: ST4000NM0295
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 ea0c4bea0bd0136bdf15fac834e84f1df088bf75..1132c292ce7dfdbd4292f21a094af35341f5274e 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
@@ -101,26 +101,26 @@ 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
+      id: disk0
       model: PX05SVB048Y
       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
+      id: disk1
       model: ST4000NM0295
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 564479ce20477ec04b1bcb35bb89c60ae92dc56e..ac27f8c4428333559920114236a7a8a35825b9c2 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
@@ -101,26 +101,26 @@ 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
+      id: disk0
       model: PX05SVB048Y
       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
+      id: disk1
       model: ST4000NM0295
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 031c0e37e5b2be8a652e7c49a75368503b06f9cd..f2d48b7d8e8fe2fcaf3d96a7fc0fecf729edf23c 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
@@ -101,26 +101,26 @@ 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
+      id: disk0
       model: PX05SVB048Y
       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
+      id: disk1
       model: ST4000NM0295
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 c4b812c94fd5e8b6dc18608ce73ed9e0ffa16847..30a1124dcd39ea793aac21de78ad98a3b862ed4f 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
@@ -101,26 +101,26 @@ 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
+      id: disk0
       model: PX05SVB048Y
       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
+      id: disk1
       model: ST4000NM0295
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 e40151d9643df16c34588cec152f6dc83082c88d..40b51599be82c616002518d43976c81a6a5398a9 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
@@ -101,26 +101,26 @@ 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
+      id: disk0
       model: PX05SVB048Y
       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
+      id: disk1
       model: ST4000NM0295
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 818f503b97818abaad1c991ab874a27b189c2eae..983d00cd07035627b961b00bcf732e26109cd9bb 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
@@ -101,26 +101,26 @@ 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
+      id: disk0
       model: PX05SVB048Y
       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
+      id: disk1
       model: ST4000NM0295
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 39c68b996146fa59eabeb58bbccb53740bb3aea7..aeec52a29cb40507909ab1beb05fa5022cd22aa5 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
@@ -101,26 +101,26 @@ 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
+      id: disk0
       model: PX05SVB048Y
       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
+      id: disk1
       model: ST4000NM0295
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 a9ac7dc76a9394bef446090d5434f8866712bb11..ac29f98c93477ab6d3c29bd0c8426d41be583b35 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -100,34 +100,34 @@ 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
+      id: disk0
       model: PX04SMB040
       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
+      id: disk1
       model: PX04SMB040
       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
+      id: disk2
       model: TOSHIBA MG04ACA4
       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
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 9b94723d906ce068873d4cfe18c054b19f5b0f30..f11d5ff11fe1cae915c3ae0a260b01242ee2672f 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -100,34 +100,34 @@ 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
+      id: disk0
       model: PX04SMB040
       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
+      id: disk1
       model: PX04SMB040
       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
+      id: disk2
       model: TOSHIBA MG04ACA4
       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
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 f587342feadba7d2aff0db5276f40c661e130e5b..d3d65bc7197417693b4362ce576e5cd1493b80be 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -100,34 +100,34 @@ 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
+      id: disk0
       model: PX04SMB040
       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
+      id: disk1
       model: PX04SMB040
       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
+      id: disk2
       model: TOSHIBA MG04ACA4
       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
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 02e84efc9520d9f0f28240802fcab692ccb1950f..13879d53a0d58f2b698aaa273c9e8f7deda9fbce 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -100,34 +100,34 @@ 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
+      id: disk0
       model: PX04SMB040
       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
+      id: disk1
       model: PX04SMB040
       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
+      id: disk2
       model: TOSHIBA MG04ACA4
       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
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 439a21ddaebc79afcc8b5ffc64bb141b9339008e..4c743f800619e842c6be0492871fa51d95b7d08e 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -100,34 +100,34 @@ 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
+      id: disk0
       model: PX04SMB040
       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
+      id: disk1
       model: PX04SMB040
       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
+      id: disk2
       model: TOSHIBA MG04ACA4
       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
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 ef8b5bdead5ad5fc68112d981acd6c9f9bd81ea7..eb34ea4aa1be8c95310c99e33b8fea53a06094b2 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -100,34 +100,34 @@ 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
+      id: disk0
       model: PX04SMB040
       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
+      id: disk1
       model: PX04SMB040
       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
+      id: disk2
       model: TOSHIBA MG04ACA4
       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
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 d968119477beb73f859c05bde105267ab10280e0..5546659c2d3fc93848eb7496a8f32fb82cd1f2f1 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -100,34 +100,34 @@ 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
+      id: disk0
       model: PX04SMB040
       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
+      id: disk1
       model: PX04SMB040
       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
+      id: disk2
       model: TOSHIBA MG04ACA4
       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
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 e318a34320f0cf06a26f3de25cdc2ed2c1cbbac7..aa111db235c8ab20b0dfdc5d0d70765c5c06383d 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -100,34 +100,34 @@ 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
+      id: disk0
       model: PX04SMB040
       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
+      id: disk1
       model: PX04SMB040
       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
+      id: disk2
       model: TOSHIBA MG04ACA4
       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
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 ed241186e5042e0ce65671cefe6ed296c8ef6a30..1aaafc3f073f6b3ae944e9aae1cea6d3e6f32b06 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
@@ -118,50 +118,50 @@ 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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: SSDSC2KG480G7R
       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
+      id: disk2
       model: ST4000NM0295
       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
+      id: disk3
       model: ST4000NM0295
       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
+      id: disk4
       model: ST4000NM0295
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 01448975bbce2b82407b25c821e6661257a34d08..6625e7bfc2545f319569e215215cbf45f34bc10d 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
@@ -118,50 +118,50 @@ 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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: SSDSC2KG480G7R
       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
+      id: disk2
       model: ST4000NM0295
       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
+      id: disk3
       model: MG04SCA40ENY
       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
+      id: disk4
       model: ST4000NM0295
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 88d025853300c3bfc65d4a03bcc0f7b1646d9c9c..b894d2c483d85b1aba6fbd3572be43a934cbc1b3 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
@@ -118,50 +118,50 @@ 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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: SSDSC2KG480G7R
       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
+      id: disk2
       model: MG04SCA40ENY
       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
+      id: disk3
       model: MG04SCA40ENY
       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
+      id: disk4
       model: MG04SCA40ENY
       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
+      id: disk5
       model: MG04SCA40ENY
       size: 4000787030016
       storage: HDD
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 5b5f66f50f68d6ad09af664a90bac1bb6440edf3..8a5a96598fe7fc86c3cd6bc1d1a658a2ec53cf3f 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
@@ -118,50 +118,50 @@ 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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: SSDSC2KG480G7R
       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
+      id: disk2
       model: ST4000NM0295
       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
+      id: disk3
       model: ST4000NM0295
       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
+      id: disk4
       model: ST4000NM0295
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 738403b6ecc391ceafcc1674d6c62fdb3e85f15e..6f5f6964e19721fc8bd3b07d2af7a9bf005d12ef 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
@@ -118,50 +118,50 @@ 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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: SSDSC2KG480G7R
       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
+      id: disk2
       model: ST4000NM0295
       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
+      id: disk3
       model: ST4000NM0295
       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
+      id: disk4
       model: ST4000NM0295
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 aabd5f067a9eb2b0d8f204920ad75d703f46bc5b..e9edccbb95e427ff3262ef4e02817d818be081f1 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
@@ -118,50 +118,50 @@ 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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: SSDSC2KG480G7R
       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
+      id: disk2
       model: ST4000NM0295
       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
+      id: disk3
       model: ST4000NM0295
       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
+      id: disk4
       model: ST4000NM0295
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 0d684b624bcc23e4ab9f94d26b9558cec5087729..844d716306be48704971583cbf3e2092b2e194e4 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
@@ -118,50 +118,50 @@ 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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: SSDSC2KG480G7R
       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
+      id: disk2
       model: HUS726040ALS210
       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
+      id: disk3
       model: HUS726040ALS210
       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
+      id: disk4
       model: HUS726040ALS210
       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
+      id: disk5
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
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 38f7b25121525ffd9191433a07e00e373694a3df..d1d9a6c2d97c650b3087fd93ccc735c21b795848 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
@@ -118,50 +118,50 @@ 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
+      id: disk0
       model: SSDSC2KG480G7R
       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
+      id: disk1
       model: SSDSC2KG480G7R
       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
+      id: disk2
       model: HUS726040ALS210
       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
+      id: disk3
       model: HUS726040ALS210
       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
+      id: disk4
       model: HUS726040ALS210
       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
+      id: disk5
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
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 63d0f1d72a35c76adf3c29baeedd7a46f430e072..38ec22d70523bf2de9595b28157fb5e184352011 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 ce81129c280a5d7d5d66f4ed2f02bbcb7b543e51..c80d32c8f6a6db10f21b81cfd1a2c8b82491b3b4 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 8f3f0a89ec1db1e138d5764f6229bcb65bc06911..1ef5926f7f3b4ef723b985625739d58a3fcaa0e2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 de0eaa2785e4ac30cd1601a7e6f01c41848e23d1..d925436904e293c31ed34e59e281774fc351dd6f 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 32c74eaf2da7438f3c41e186ca50100def5eda51..cd7c525598353c53cc39a045bc86bc18e9121337 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 50cc7dd527d016e337b7de0554cfb7d1f159cd3f..8b1a8374eeb855a3c6ae0ffff8e63f7da5420cb8 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 d8e3fbc3fc3bb3fe433e703f0de950201b8593c2..e45da0157108612acdf03c3ead7ac94532f0aee8 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 1f3c750132f4e14770acade5cf9494bc0d501769..3bef0166b2b87ce8d797acf1fec837b97dd32841 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 f706aedccdcb8337e65208ba9a1a37c9fb7b267c..7f27c0fd21a8b1c97c17e36764bf6995325089df 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 043da87e5d674289ce64065bddb4e238dd1162e1..ce9c715a0aaa41a94dbd6391719f8bddc45a1076 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 85340cf9bb2d93d5290c994d1c29c7b7682da306..936becc68f10a045cfc9f6a7a8ec9222553d85b5 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 45bbed07fe2174273d3b00c7dc2b75ce686a4855..8773c2809f96abda3176ab5bc2be65c63c14779b 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 45125bb39073bf880301dbe701abd12e10e01d40..ec354f1f8a92f21d83083a9d4f833c969f5eead4 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 82d106bad3e1289282bd8696655c0809027422d4..f877683a37fe5df4dc37a73f288dfc24434038ea 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -65,10 +65,10 @@ 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
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 d84808e1cecd3946ff53d3b70f49d3daf36463ec..4b4edf79d3a1f385bc4a82ee9bbfc68c75608030 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -174,42 +174,42 @@ 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
+      id: disk0
       model: SAMSUNG MZ7KM480
       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
+      id: disk1
       model: SAMSUNG MZ7LM1T9
       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
+      id: disk2
       model: SAMSUNG MZ7LM1T9
       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
+      id: disk3
       model: SAMSUNG MZ7LM1T9
       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
+      id: disk4
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
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 0c74b97a21be6d8c47a906de12bd2c8fefdb1342..6181bf633a7e40a3642006037a2955c8866b5be1 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -174,42 +174,42 @@ 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
+      id: disk0
       model: SAMSUNG MZ7KM480
       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
+      id: disk1
       model: SAMSUNG MZ7LM1T9
       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
+      id: disk2
       model: SAMSUNG MZ7LM1T9
       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
+      id: disk3
       model: SAMSUNG MZ7LM1T9
       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
+      id: disk4
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
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 7b8b0278d9dbcb32f9ed8a7240b2579be64460e6..58d63804ed7dba6305d5f1e9615b0701b9d7eda4 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -82,26 +82,26 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-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
+      id: disk1
       model: WDC WD2003FYYS-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
+      id: disk2
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 6adc2115b6c76a36ec34ad31280ef3d0c0ba55b7..2506bf47e712f844e25354c9067a6e3d906a5f04 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -82,26 +82,26 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       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
+      id: disk1
       model: WDC WD2003FYYS-1
       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
+      id: disk2
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 197ee129ab53a11f92207d16263e0a680825acc5..b93ee4ff2a980dce367f8d9c25b8751199a42dac 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -82,26 +82,26 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       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
+      id: disk1
       model: WDC WD2003FYYS-1
       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
+      id: disk2
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 352272e4b2ad2ff8073a9eadd16a1a3c4e2c532d..f72fed900d3c4dc21dfb6f414a050042698dd038 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -82,26 +82,26 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       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
+      id: disk1
       model: WDC WD2003FYYS-1
       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
+      id: disk2
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 d218bd04cca8575d31fa1cac273daebb6420d6ba..e99df57b0071f208533ee8b7a7a71f7224d025fe 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 ec6cca20a4aed4a7ac3f896df6187ddfa55004d3..656b2c3e10f59f8d3d9910b93d424774c46c7d05 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 4b2e8356da467cd1eb1c1285d25251ef88e7d6c0..9862f15aa93f030d2bcc597f5f982062d5b28f50 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 74039bd77694783ec659e6bd3dbcc5cc849272ab..f686a1be02b764d7e195a1d0dba09f3cdfdd05bb 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 a22e9cb011f5787244f4978bd0ff3194591ad0bf..c9d88c651c1394aff1f4654898ad9e8bcafd567e 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 79bd0e4c7bcc94f7ec1696d0530e8b5d5c5f22b2..91e0e675ebc909658f7ec229992f0539e3030969 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 be4f288f9e59ea25edd9f933e7e4f97b778a6f01..ef771b0270de14faea9aa09b7b8f1c162b860e4f 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 ae182ae1b889d7d0eccf8797081d8ed6064ce860..bade4a3a94659fc31865307e044eba94e08192e9 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 bb7de96081c643d66e51bb2a905e54848f82a4e0..5944eaee81d4f3dc83284d119c5fda2bcca211e1 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 4fd9a6421e2180ca18633d9176a9c7f66e5034c2..0bc198c5d7759d505b6ed8b359c1e7048f325096 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
@@ -153,9 +153,9 @@ 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"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 e59c051f0cfd61ab51434db82f2f1e67ccd22b1e..6b01a16c59e646c6376045a1dd5243c72158d674 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 90c93383d76b9b5323cedc9c1cd035a3f2dad6f5..92251de545a143716cec3623afa056cef0915daa 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 b5e7b237e16435ca643356e50d6c50bbc8eddacf..4338e297b15424dd580e2f2cc5522add439d967d 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 2c2861bff0cf56ec7af6a1fad9dda474ed99a8d3..b4c8b2ae134936f4e1f870c763b3447b4a11308b 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 ef7a9f000911daf3b66876544bd585a2d0a7da17..10748c83868c9ea9fbb38170310b374b1c63678d 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 142487f20c48b2a1e1fc943546e78d6577a641c6..892f988cb48baba21953d87bf3a4bec2051386ab 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 31d9a113fcce12545827f8026f28cf6568925b82..5ec1932338969859f34facd61913d733aac528e4 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 1e260939f06ace8e08d5daf1dd4004d96fd9d1bb..223f99e42c9c93dc7321279d70a9162f78452cd3 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 24db815d48a1c9b81e6251b49e1001cd5d8dc8a8..43d5e5238f334dd7db9541759de6e7be3d007b55 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 fe8697a563cee52b578861a7e836a2d4e3d4a49c..185987c0f8e0c004d1481ccbebf20541ce36c156 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 ea1fcd87e30c8139c77bab710d155163bd8d11c7..e2872382ecf16da6f3e66d4577f2ad173308180c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 fbc19d52af7cb529fc3f518c6993567c3d6cd972..d8bfdc60cdd9fe42b4b36405d39176b108eaae63 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 338dc0a43b554513fbd51a851ab30eada9c9ba55..d096f3594d4ddeae18dba2527793f951c95a2bf3 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 8edf60fc76bc7eecac5110f17230c42db7ef24e0..a339269506a5bceeeb936e26b754429245852ba8 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 7be02accc4ad57330da9828fd21360657e15d69d..c81b8e426e39252e87ea906c81a8b896a42e3f19 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 ac1cc46b316d091185ca777c993843ac9766242a..b9815c966e9a0529baa745b6610b282a2cbe7177 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 1e335ca9924a4077b0b86b8a7e8e703a6988abab..25e867c91ce6503f86517186a6914d78d882d1f0 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 ca8926f8e806208dd19fbeb221b2185bed3e71a7..1bad40e2fe78a7ea735882fc7374d3d1f860e8cc 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 b8068a015242720158c30b653900bde6d5cd23c5..d67b4ff5543fae09a0134711663907a1b9a8ec06 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 3948483972c98a858acfeb5666dfd1b94a92db47..0ed9c5b1c6aa736e0554e8597bcac10fb9572d52 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 a3e470ef3dd3a6e6d89cc1f24667b9cfb0289d52..b9e617083d2017fe5f8bbbc88a103f139e0bc3b6 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 d29244c7e87d67eec10c14e942275b82c613f6cf..954dca1844f47527aa354ae6ac45126c4933c1dd 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 383c54b602577744a80781ecafd1950e98e3cec1..d9003ea21285e7b755643aa449dcdcf7233039c2 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 4afa9a209ec61e67183bc6517a01768ab9c2f24e..d90305f24edcae68ad738d33e178cfb48dc9abdd 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 f3d4ee39cee103e0d7b8dcaac3d45a687aa012b1..1bcd20ca8e5d9ee10ee41309022bc4aa2983a531 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 e9d16752cf85e0f513f749b6f68f01cc3dc3694d..006857306669f6245597f5442513f0d27bc212b3 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 1e146c1d4f359ce5e354a19aed1fefb5c39b91db..9525fe9a69498ab08b4d960195f6e8a15808ce60 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 a576bfc86ceef60989939d486550abc142ecae32..727b612bf0253e8b7ae8c29383c69145384dec39 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
@@ -76,18 +76,18 @@ 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
+      id: disk0
       model: Samsung SSD 860
       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
+      id: disk1
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
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 6b9dbc35d171f468bb9a98eb23756249267afac7..d3760e3e254e1df8f5ade6c94f3ae0eab24128ea 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
@@ -76,18 +76,18 @@ 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
+      id: disk0
       model: Samsung SSD 860
       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
+      id: disk1
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
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 f2171093370a6c881754c16ebc6f136306eb2647..ed7d3b8afa6451e67673eb8312dd2520d102bd4b 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
@@ -76,18 +76,18 @@ 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
+      id: disk0
       model: Samsung SSD 860
       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
+      id: disk1
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
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 7773ea41a4c048a37e90d9454d82924554df494d..6438e3474ea81a890bd28b9965c505d212515454 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
@@ -76,18 +76,18 @@ 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
+      id: disk0
       model: Samsung SSD 860
       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
+      id: disk1
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
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 1982dd5278dd9fb005d20faa75681597b45fbbaa..29f3539ec6c62bc3a58d14e50be363385bdefa6e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
@@ -49,9 +49,9 @@ sagittaire-10:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 a77886378a2e8d26911ec5b01725236d11d626f3..e63f1c058d250ae809ccf8732b2fe507542cac3d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373307LC
       size: 73407868928
       storage: HDD
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 60722a9f773f4c1e45a1c733384505fdcbc30f3f..4ac89ccbc925cd64dfbf9a1c38fcee0f6b719815 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373307LC
       size: 73407868928
       storage: HDD
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 34a08da72715c7b4f8eb5e5dc83dbe0a813578f9..0130dc70f0ed262c531cc410868e91d5e7b51b9c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 055c4e50ac4bb922b33f3810a62519bec8946483..c59de4bd263083161d3bfb40d314ee5921e87917 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 21e4ccede2a9f70e59e7ce8f459c9a8d2c8bc3f1..1e0111e5a84709103b582043432f790b293fba4f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 62b3ecff0115f78254d25ebe2b46f8720a04635a..60c06fc64daa13ac18f428086f5ae378a6b2a9c8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 2ad91b0bea8f81a417c2006defa3cffe87a3b561..dea22c22bd6580c8c3908dcaf13507a126a0cf60 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: MAT3073NC
       size: 73543163904
       storage: HDD
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 2386fb7019c98e42e77a659aee3ccd4d0181d15b..e5456a170c6c5718a0fb0ba6d2a6306d548361a3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 d7042022e026df4e863b7213c114733fe3ce4edd..6a1a03856b034033ec1dc4177ca30bf65c83f3a4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 65bbbe7d3ba497fdfb58bebd3eb79694191955dc..f9f77d01bc450dd12905ae611b763193a29e0ae9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 b204371e05267b13ca9e528ff20a22fb33c48fcf..e492ed5cbe242927d2d7cd1f6f54040cdb638c5e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
@@ -49,9 +49,9 @@ sagittaire-21:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 91aff8716f5a8635316e71559f7c9ce3ba33aad5..61264c83d4eda660e99bb3b7b6bb1982420f41fd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
@@ -46,9 +46,9 @@ 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: ''
+      id: disk0
       model: ST373207LC
       rev: 2
       size: 73407868928
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 04c301f48a99ad67b1b69a90942bb77e57df8b56..f1234f0bf3c0c27cc819989511b38d6b9bc4d3e6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
@@ -46,9 +46,9 @@ 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: ''
+      id: disk0
       model: MAT3073NC
       rev: 104
       size: 73543163904
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 5aa560fd0bd28e8be92d1cb7445df0855ea1cf3c..3e4b4402d6f2f4bcac94b38970b5abd3a3a5bfe8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
@@ -49,9 +49,9 @@ sagittaire-25:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 eb340c9ac6ad37748e7c1840ea1fe904d676b9c6..03ad93be83be1a52b5b6690832e83b0b854375a8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
@@ -49,9 +49,9 @@ sagittaire-26:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 7a4bea901d634f118caaf39042fd76e8f7b1fe06..b67006ab289eacff5e664697ff6790a1b18e7c6e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
@@ -49,9 +49,9 @@ sagittaire-28:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 8ac7f21966a500129740fe896bf27e4a32aaf7f3..6abb7b5b274c5fd2598b2feb28d8f44c29369c08 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 f4576f2c5cf0350ed955e540c4aec0ce2f52dc4c..eb1dcb5179d55769cb4867c3b5a4b855aa1e41a2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
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 1920fd6a3747f4175e53253b3b041e13091e1869..c2f4a2edcc930fb2c18ad7586c0eab616a93a078 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
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 9c3b8c7350e40ee7aa8769b7e424bfdbdb9cfec1..3b3a213ec3022d187641effc7714d27b99581c34 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
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 1474636b4a45f06dbf5e0e79132988250578ccc9..3a5af1c6c559bcb7d1b6a43fb7c9d31b37e4ca44 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
@@ -49,9 +49,9 @@ sagittaire-35:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 da81ad6b9657158c8900d2c51b75c1901fe4bc82..5b477e24ae8a43b0467d88f8a6932fdcc6a8f1c1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
@@ -49,9 +49,9 @@ sagittaire-36:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 fad8135e079983af71a2bed11cb1fd778e05b84f..9f10ecd48d67202a02d70d7c130bd25d5f007cfb 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
@@ -49,9 +49,9 @@ sagittaire-37:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 461ead1b027c64f567fd230da250d53f91de76be..c7f4c24b0aa24d0c53ff4f6ab7fe940c1e3e1d2c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
@@ -48,9 +48,9 @@ sagittaire-38:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 fb7e23d2bd1015c27b261554de7fb5ef513b9345..9a1b3fdf01cea54fb7a1e6d07198132c2602b22a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
@@ -48,9 +48,9 @@ sagittaire-39:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 2f57798072ba19fe105227c8077be2c74867035a..168dade74c591d931a633b7b9233eb8067f2e88c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 57f93922c32be5b65f0ee04d065c89f795d2c197..b33442e06f388813b5bc2603860733ba128f5497 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
@@ -48,9 +48,9 @@ sagittaire-40:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 dce2034b77e74de4ab2dab7aec37d8980a3c15a8..797b758d8661325bafa891cf78e83f45ead20a0c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
@@ -49,9 +49,9 @@ sagittaire-41:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 160639f26759d617d73158343da464b27bb1d695..1a89cfef0a108da1fefc79a39c13072f33149f56 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
@@ -48,9 +48,9 @@ sagittaire-42:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 e7a22983485c48ff5185531c3dfd58d99ad25226..dcd5ed2d831eb79653c936fd213f43c32557b66e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
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 00e9229aece8695e3a4f093047ec78ffca8b0a90..f56d0c6e16f44eb08f4fb4c3c36c16007d08da90 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
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 3c64a3160bc4b8ef0b1bd3bdeef6c73c66445f35..67ac0f3ab482eb54de5b4324b3a303baee61f7fe 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
@@ -46,9 +46,9 @@ 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: ''
+      id: disk0
       model: MAT3073NC
       rev: 104
       size: 73543163904
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 5ade5ac102187907947ad1ea009f898d3a553aad..e7b5137180f301181fda2a1c7ddc618469bed26c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
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 f69b37374684e3255fd5199e16b15c9dd023de43..51e3835a09e184916dc82c46366e44218b252890 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
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 a67f3d24fa6c4d6d3a210abdd77051632f2bc179..d138d772913e2579ed7752914b07d306c4783c09 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
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 1727bc8ca1c2e02980bd6da5e3686c5ce5ce5814..9a518873ce04f207fb92ed18788a0063262d5db9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 07e2a5f707a0465aab4d625cc264fb4bc15446cd..b27b48d3dfba37438afd2690bfa27d082f310703 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
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 506b8332a1f10f4c37cff75bcec88f4d39f635cc..5b75568f0e7f9bf359da6d60379b37be262a267b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
@@ -54,10 +54,10 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
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 cadf08759d3feb0f07c7994049094f348a91b353..6664e08c49dad362716d54224be6246543e7a4f8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
@@ -52,9 +52,9 @@ sagittaire-52:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 4a7e2c0f496c16aa445226c478c4661925719971..f9bbc6fbfb6d1102eb2625eb12300a17c28adf04 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
@@ -48,9 +48,9 @@ sagittaire-53:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 1c0fa8afed9fa4d8f3c68857344470fde7d05eaa..f72b4752bb5e458d5127a64455fb526339d3e673 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
@@ -48,9 +48,9 @@ sagittaire-54:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 8f7e2de9073a142d322d89ec6a6b54270ac5a973..cd0bb59d729e0dc48c31e8e590984e56b6219369 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
@@ -48,9 +48,9 @@ sagittaire-55:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 74d00355271af446440e49cf595765a1c14931fb..d055d3127b8d61f71d6f3e0ca1a1be36989db17c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
@@ -48,9 +48,9 @@ sagittaire-56:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 ab858c978a635650b2e0afe9c8b68b113b42bc33..7dfdf14b01dfd91f8a11d1bfd193e8c8dd495561 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
@@ -48,9 +48,9 @@ sagittaire-57:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 365f76dc40784574f947d70f249e9f94bf4fbae4..739eb46c64a67e25423caead31b82ece8418da69 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
@@ -48,9 +48,9 @@ sagittaire-58:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 c6217f28c59bc94d54751cd627ef0f865bf32b57..bca2381f5cb696ed171333a8e3c98eae35038680 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
@@ -48,9 +48,9 @@ sagittaire-59:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 d6825f3f13ab283476643af631dae905687e6e85..946cdcb6856fb14951a997fd4e2bd3d48b006839 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -64,9 +64,9 @@ 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
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 ffdb6ae36647e851c1a72a801b95830cfa8a42c4..e0e10c6b12e7c1854e571297f0fd60244dcf4477 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
@@ -49,9 +49,9 @@ sagittaire-60:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 992399b34294b942d2139dc07de734589c71b669..e8e712e6ecacec58adf5b18adb143408d7de5601 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
@@ -48,9 +48,9 @@ sagittaire-61:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 90b6c57c75b75c3db0dc5cbca2f9b39c35addfec..616e4a366690f5f4096d04b767249e3e39739310 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
@@ -48,9 +48,9 @@ sagittaire-62:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 5a17f1746e2f0a745cffb4778c2b86023b574c03..defbfbbc78db7e2847ee92ef717fc2ab34c965e6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
@@ -48,9 +48,9 @@ sagittaire-63:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 c2b2a452a1b95db3a93db120c17ad57279cc1c8a..d39ecc9bb7fd04873c720c60a9896439495358d0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
@@ -48,9 +48,9 @@ sagittaire-64:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 de4f7ddbaefba0583c799d0e0eebb75d82c434fe..f5c18ffde3a1d6d69d870afc6b006c9566bdb7ed 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
@@ -48,9 +48,9 @@ sagittaire-65:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 f3ac27843261f60f4f3d89f3ca047b8eefcb7ce3..15d4da5e11b3db39cf00cca616bd13c6e371f916 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
@@ -48,9 +48,9 @@ sagittaire-66:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 bb23e807758574be4c1ba95c9e7132a0fff35e29..c155364c6dd5372906ce7bd881cb4f2dd735df07 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
@@ -48,9 +48,9 @@ sagittaire-67:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 498ef58a895eb0d0fc7be925b6cd5de410ca12fd..d427435f33af232407ab85d12ff58ee1ba1d7937 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
@@ -49,9 +49,9 @@ sagittaire-68:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 5805c932b46f82c18918e0dc89c3077762eeb8c2..d6eb511d87080d8b326902a02a8dffde90cc2792 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
@@ -48,9 +48,9 @@ sagittaire-69:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 f6764e3c11b2e5da2248588eb20a9cd2ae04b008..e6e01cf8c724882d35ba5a54feb8212fe35f3208 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
@@ -48,9 +48,9 @@ sagittaire-70:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 8f86f70743bed4a870640a97b040777c507094d6..800209f44503e201329ae90db83b6c61637671ce 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
@@ -48,9 +48,9 @@ sagittaire-71:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 3dbb450408c40959b26f7977b731eb88495c235c..1a4b0ca9f2b6e51dcd98cedd86d3641a6c321349 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
@@ -48,9 +48,9 @@ sagittaire-72:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 1233b1e795e1a51d3fedbc8ffb2735a1a4a3c229..8d281549f4860947a2e006a511504b94f452ae01 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -49,9 +49,9 @@ sagittaire-73:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 1c448fac3f1662196b8423297005d77e3b19f037..470901e11cd95eea4f64671d6ade3b6fefce8038 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
@@ -48,9 +48,9 @@ sagittaire-74:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 e6e79d08aa7ab3e085535766bd8f639a5580406e..7198904cca5afcf78b2dac6cba64bfac39fb0132 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
@@ -48,9 +48,9 @@ sagittaire-75:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 a2a05721c1d610cf9f3dfedd6c947049ab79b978..c96b0c5e3accff4b83b693196920cf2214f512a8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
@@ -49,9 +49,9 @@ sagittaire-76:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 328d81ac25f8a1e5a967fa75ebfe9ab1467f4308..8323b6ccbaeafe06aad000717d859b81d4031b83 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
@@ -49,9 +49,9 @@ sagittaire-77:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
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 46dd61fc3b3bdf7d01b5e8dc80c466252026525a..6638bbf012ffd54770c91be0ae8a52c1ed167136 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
@@ -48,9 +48,9 @@ sagittaire-78:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 778a8985a988641679ae91c499f5d1adc683bb16..2b56c69b4d3b57c0da6dd854dc2e55bb7f4ce231 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
@@ -49,9 +49,9 @@ sagittaire-79:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 5d33544aee1748df91ad0522948dfb82b33316d7..1541168c9258e01ccf9142a6c399d2850d41acf3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
@@ -49,9 +49,9 @@ sagittaire-8:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 1eb0e0d6e4a8ac5cdb196c8375ae7d1804ac5115..0ae2e4b03e2e88daa9309c3f258518b5a5c265e3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
@@ -46,9 +46,9 @@ 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: ''
+      id: disk0
       model: MAT3073NC
       rev: 104
       size: 73543163904
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 d7daba7a4c8093b60949c12ea6977b6b72773fc7..7324eae49583782443049f779d5522a5a43e0a36 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 f78a101b6aa30e4ab91f8c4fcec56c953fa3de72..c63fd5d9bd4ed5a37e71021f8ef797609a2de252 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 37013a2101524311c7aeca767f3f89ee695a8e58..52c6a7c981916d7e2cf586d48dd374a459e75db1 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 136b3b00b2a327abd7b8b4dda914710ddaa19945..539d95f589e1dbf7207b48fbf47e86386eb5aacf 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 89fa5c10bc75ab4415bee2b85e3ffb2e3724db8e..dad2ffcad6cbd33b6aecb63f236891e846dc3776 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 3911a8fd6de2222539d39cc0272bc6855cbd2365..e5a54c4a50b60485a3b11ebf9027b24bb1edd773 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 d7ec3a450a31eebfb8d8b6b805f77006c82c7668..9d95be0bf9426fcf787db01d5d15883d04d0fddc 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
@@ -89,10 +89,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
   supported_job_types:
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 b396116674f7a21290a532eea841239365c9be6b..5cc498909f3466d58e406b4ba8a5cfe4234a2359 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 775b6bbfd29f27de40854968bed0eb826f57d4f2..aa76bc786beb69ae4ef8f9e202a3b72f7a43eef5 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 1a08316378fe73d708527e1574a843af414de8fb..da0b35c790363c490d3b5e9c5d39d38e17b393b4 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 02cfb5f9e702186a136bc99184970ded8833b24a..25efc15cbe9347ec03e3a9ee0b5eb45224812283 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 f39a3c8939334901b9577a38c7bd52d64b848781..1bf50bcf22e1370b5c88c6f1b464537dd5ea30c4 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 901755dfea414069b2f984e6314ff47150f6eeb9..658b3aa48e6d3e5cf681bc40d6e7ba8c4e4a1559 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 8bc068bba16c1a06b31b00955ae64c9a7f0f4a45..fbc2f19e18ab73b6acbb5ee70b79c8f7748cb5bb 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -100,10 +100,10 @@ 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
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 5809c63702f1fd1244516d3effb0146acdb05129..4f32634183cbf29c08af1c5ca631cd6ec230cc4c 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 988585dfc187bfa2d578b90610c5dc41b15a7cf9..dc245bdcaf9744313fc5e3c7287efaed3dcb6bd3 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 53991b04334d41dc50e64887f0095044b63cfb09..5d2706bb9fa444124ad8575d35e930dda3bbc9d4 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 55bd982e1708b73f74084754863da978c162632a..6550b2e7ffca37128c237813e69c0c2608f8e3a5 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 ff9edb2726ba35ec408aab03f972dd012b0ee3a2..d5dc3b79f4c2e5d8d74786d95dae4d77ad7304ed 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 f56e4fcd12843bb956849ade6dd28986ed087969..83539cad4e770e5dede944cac0d6c9c49dbf3bae 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 e6235b640b8df297876cd271bfd96257b24b3b5b..3bfb1eb7c06616121f9e968f4c1fdf486b207538 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 9f941a9388df72b417ae432ab8b7d45a297ac931..eb7754206c60f344cb40f3318b610045d3cc758a 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 9488c87eabd8bd6ab38301a95bc5e8c762f670dc..49fe2d46cf31344219dbff5c1ca3ca0e6789e29f 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 ff66a256f456c901c0796cd5b7bea9012e4c2df3..952b602adaf6163e4e6f878f6fab5286f5c52c68 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 53dc689793071dc8e21750fe7bb2f84a74f15302..746f2692489f6ee5c354af18a5f39620c6bfa017 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 4b56e4d1f1162d406c10cf1305694ec4ea4adc19..d0144e06c9d9c16ec8070848057b14b5896feb33 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 dbd3d35520a1210012ab80fdd807ab5a25ab6f01..e7c7c6f0a0e9da0853aded301fe2d39f50b1f56d 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 5178b69614830eec30cea62c96a6600103b3efbf..7943de8eca6f7767724cdf7e9a913f9b6dd453c9 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 cc21568bc5bddc8eed4484584ba52b17d434d314..2a03171e8f42fe76cec8fd559e8596283db37e72 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b43e8de8d63964c2aca8fcde55c711b639d29695..d40e693cd5c572844e0fca57d724b4e91c17b1f4 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 aec5c8fd9b3552016beee1d0bc4d6b308ecaffef..05a1756e2e60e25db6082b8fd0d0884348f5c828 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3b59b920a3003552223e099645b7a3c82a732922..136b059c92e8d4d678d9baf75080a04f0106e685 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 53062021ee40e4249dd6689bc37b1d7eef2a8aa6..e2466431342a672694565a8e658c096b24cd4af0 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6d6911a25d0db5a0b92c2e331bdcca07ce9f460f..2526900e4b128d7bc5fd2d90acf4f4f86c2fd72a 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 01111d5e3a703b4ed01ff1e6c795342ecceef18e..2c248e5f556fc34eb3fcb60492620e87c2c62f1b 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 2c28529ec6f629f59aa8f50d636ee24dcefc2190..52cf92a262d967eefe5927c5c0c47fb03263f2c2 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b57add965a3a9782cc948844323b6829441e4fd8..069574a250908e6e51370e8533ba6f3bb515ae0c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 e69e54afc6a93b6e6f8287e787361d58e82620bb..8d0f83cdba7eba2b11521da5cc6ce12101b3bb86 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 ffb31c7573a79b6cdda5f6d52f661100292deae3..5ca98b12bf59d260f6334e262af6ded9a0e0023c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9b8898acfeb675dc8d80abd95feab637534d5af6..34b6701185c742c9b7b3a35971c49694a7c75b9e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 83140815993d235d15a65204fcbb7d1855924c5c..41be199a52c2caa7ea8ff7037aa2a723d811afb2 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 0e6b2f7a0bce870b85fc1d1b83c360643a8d6f36..e596366c50d599ff3b7eb4cd9f3964788cd3da17 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 13b16b75170d782ae760ef556d0a743a12da0c2f..e2fe3c0207e077daea96dfb732ba9168e8fd63ae 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -112,18 +112,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 d6815d360e3b883d984e36410238037d5bf091cc..34477b09dd1815bd28453204c9d7ce9e4800037f 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 e6be7f8a4c61cb9928e61f00cfe10af251a30b0d..099fa3b38d35277d681398092b62601235cb2e1c 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 f497b20f771f45bf94f874d56cfa764fc9d83cc1..5aafa7c0d84e9563857d59d3b380f7f516382028 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 d0f6529adcae027cdb26230b01fa238566695d8a..9f6a98c3c3e7935d2b2b694254eb8758164d520c 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 ca725a7337490ec91f6284469b69c3abd89f7446..0e4813ed28ef487ca71a9770df8fbe30a331911f 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 2e3005a1715ea703de2c1c2976eb4d09e21d5d63..fec6b144d864b29b50d573fbc572f1e380e86e10 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 20b463f18e29a6c738419412c62e27ecfd855f35..a545324b2a31f81a3bdb19a199a64cd2b0938b5b 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -94,18 +94,18 @@ 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
+      id: disk0
       model: INTEL SSDSC2BB30
       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
+      id: disk1
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
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 a181d00213410c4557b7d45b9aa71930ca524168..e72c572c049b98536710947c5bb3468b0bcdc385 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -94,18 +94,18 @@ 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
+      id: disk0
       model: INTEL SSDSC2BB30
       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
+      id: disk1
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
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 d7dfcb0d360a2f0b6331bae8cc3ae430e4819ccd..2213c51faff044df11e53704a12a650740dfab40 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -94,18 +94,18 @@ 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
+      id: disk0
       model: INTEL SSDSC2BB30
       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
+      id: disk1
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
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 2184129d568c12ad8b3ffc7f2e7722fe5d405ec8..2b7bb76547c20d96bf3eb4be01a0242ee5851bce 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -94,18 +94,18 @@ 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
+      id: disk0
       model: INTEL SSDSC2BB30
       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
+      id: disk1
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
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 187e24156dff2ccd4728a2d3f65254818148ec10..5ac411b0fce8d585463accc2ad1646a46014711e 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 826d235ffc021ecdc3dac5cbb246142aec5ca1e1..d40221e1a83fccb885d4be0b481816e814450b60 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 c282394156bb1750e9a31bba5e60f28daec81590..f49a940981e74374d98de443ce01884c019fc3ec 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 e9a6a86d69128216ed107c9925c09af3e95733d4..4918c440b3c07407dc6011b0b2100ca9827662b4 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 a7b9f5d65484fe80dbc32d0e28afd5116d4c7cad..89362a6e6c8681a65deab690ed60812276642c03 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 4fb6db8fd077a8ac7862f04dd6e269c6b1e067e8..cd4f510c5f1754b8d863de7e5d5c8ea1a9b2d847 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 ac02fcfe18db38f1c1693eb3bcf2defb1b141bf3..456a2fcb56f4945cdb3b860a212456d3c9e15ef0 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 9f232385587db347dccf025caf78d58ccdd832c1..0b56a838931c258474e048ccc1a2cbcf33409c46 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 47501afde9910028f5d54817651c5aca99d5c9ff..0155fcd046c4e9b42f68cd0bf8c91b828165b812 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 53a949106148c01415e3ec5f6b812779b76f79f3..68c3ab232b9319c8b2cb4349ada59b6aa6dd5066 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 5987c7f977a6f68cc9c9ca9e6ee3e441987b1673..d2fa0ab7a1b281d3c5563736608bed7e1ee9d2cd 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 f8f52443452bf920eb319aa0f2e9b109ad1efaa0..67f524c0d324bd96887cdef296ca5992e1a34f0b 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 bcfe31f51c7d1db66fcb22c8274586da02d3d751..632cdbf8d3988e731112d9210a5af8ae29bbc218 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 3850e99f9a39d83daea223355581b80adedcc246..c68d55949920ec32a511db22fc8a950f24c1fbe1 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 4c7b00334647cb36d990c0e303c34c4a970e0586..cbfedd7db3d0c3bf3a773a5831c60af3a421b84c 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 2f7be32e05940373d6310f4f915adda915337cd6..e5f68247e5642feb8d7051e611866f1ae5019c43 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
@@ -100,18 +100,18 @@ 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
+      id: disk0
       model: SSDSC2KG480G8R
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 024aca0dcecb446be71dcc6a01448c4814afd7bb..71bf45b94d333ef39545d38fcc181cf123e99995 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 645ffe1c892b2a2ff05dbc4b0b432ba0bfe8e4df..923662857781c3f8242b296906bf5203f34c906b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 df5eea70c5aadd127dd190a5f5b84263095f3a8e..8817423e0fa928c13734ca1dff971ae361543bf0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 fa2f0fca99384c5e864148b59fc6da7145ad3318..29cf037ffdaa581d390904e3d2c9ed7405c6c824 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 513a77cd7d17ad089d674b2a7df04f768b930d23..c10fe47304f11fd1b862e984fa5d0cb59e2a29e9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 1ec10339faeffaf08928dbbe0890fc7a44681b0c..e0fe9b83178fabef02b8293a943aa188cd5a6069 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 e62d6358fb9449e81475d08c1fb7dc629b524b3b..78900a6456d5325142524afa9289b448c8c67e96 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 117400f867f10fb59693ea3c74706eec5c8e3a3d..b90d8018b6db67f53a2a02a2bfddec31272d81a6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 7b7810ec9cedf2a66bd1bd6fa11405e09d4894eb..5732ed676e6e860f0e7c5172e548ddc9069ba81d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 0bf814e28427532990384eeb8b335382a763390a..248131a99c75692f5fc85d8f67bf3df615e84425 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 9fd891fd67818325a58a78ab197cbd3c7e74c6d6..86c178a2a08ea95ee0a35acd1901fc123f05b3de 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 b74c991333dccc4f769e38f6830a723160a69e28..fb0c7781e4bba3cf0a87011c6421cb3ef9c681c1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 4666a1167115e2e76054accffe5fa5f661713764..4eb180db434882b8e75334ee127dfa2764980971 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 7e83f484ee6dbd8afd2c16df6263b0f1b82383a2..5c007a357d755e0923ee53f62a70deca6bdf50d7 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 164ad6071304f3e4faadcd55edb888d064d699e0..0eb42e6c0ed255ee27b6a838db39a2be7b230a95 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 c3aa2ee8699198109df606448311939df0211f53..cd207c27de8e493c2add88e86f0de4250b02022c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 77aadbdf11731a7ba070d80423481933826bae76..3144d2b09ce4f7a0538213d308d2ef069fffaac0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 24c4ac9323bcfe55b771ee8a9248d99b9cd7e21a..8311eb76cffe4e8bcd53edbfe77c3f663d8afcf4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 2e0ba2a0b634ab25a85afeb1bc40eecc614d4f16..077ff1483cc47e206ee8c733042da7b7165c6ae4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 61899a7df280f4e8850b60af786bb7ffc19dbb06..1f865429553a54c56fdbc1a740e810b7a0b09ad3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 5399192c2e2bb798a3d3be8c020aa7373b214197..fe228b5765f6d431fff088876b64464f5ddc8aec 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 b1bbab84c99e123e6c528d7c1002ffc45b3f0d97..edb678a6760c10858083191d35f2b2d93fde36c3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 24dd678bff8d27230b670755950520a25a72cb12..1dd4226bc6a74af4cd84232315fed530ceb982f9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 79e7cabb0b534878f2d1495f738a11e4fcb09d63..1a0fefaddb1a3bc36f7faf0d81ac540346b2a762 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 964ab8c877b4e40555178d93a68dac7285655df9..ad4b51dc1820dc4b330a0b2b5b478ddcaf1d67a1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 0f0b7ebca48b853d06f112ac23ac649653ce90c7..57d3921f76be1f75e5b8f6dafe21552ae4c0e8e5 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 d8dd6fcdafd19ff3032ce302c34dab5488f9d64d..8bedee062246166ef2a4532318a2bba83b0ad3c6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 3829473110cab99340f09fbf84409f11f39a2c41..33ae2e99ff363371151162d4c17385b2318549ec 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 bed4733f2680d26cb5b9d128ff5b204e0ab11c9e..88afb0b7230e06d5b7e9ace64e68ba95098e113d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 6ad38d7ed51fb4161efbb4bb13828bd361a817d7..eb652c1504884ef9c61edff35039d96955bf3c18 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 f16d4128757e173c2e07e15545e137c382c13663..8610c985aae2a1a2fbe9a4e9b0b354b6d83667f4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 f612a2b38d39b7e50a7130a20b786c11c114550e..f94eb5283e25caaffbe8f0b3acf7a2a4d122deb6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 c487fb72d3d2c1b36f8e7868d5d4adcc6a96b320..0113a6267b45b89e05d022c7ddfded6774ada968 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 4f40c1431bc810bfd6d66bb31152c01bdca6922d..1dba74288b1ffa2d901687f826bf1ea61ff3a843 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 d43501b8050191d1480e6831724d86c2083a49d7..6ece3e41d5915fdb0340cde2a4b6690477adb146 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 3acc1d2adb95561fa972abaea627ee8cef2e4732..2cd7201df947b81091c2fa774e08657c1dd5024e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 b3bcffdba2176e5c51ca492f3f258441e50d30ab..a56e20666798f8aebac12c6ec644426edd1b9979 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 510a32930d19349251c679a7fc0fc384c028d1a9..d4965cb15e483c5f3ffa9ae3dc08312f7f572e8c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 009bf2e8c7b4eef26ac6c2d1fe2458bee4276e67..7ed150d182be5a85156c904e0ca500dd11dbda65 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 f9dae20f62ec5256c5808ab6ebc6a0143060aa13..40adc95a9a6c4062466237ab5ebd76e1404b6553 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 eab7d2450f708e7ed94f2c9c5c2c62085e88d50e..fed24f981871ed1be60bad9df43904f2e8313395 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 cc12789266f813d0fbd06b215e8884ef50d59728..93ea000060b321c8d7dd03c25cf3b987f06ba9b4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 ba994eee63707adde51d097a2462731e5754ec9c..b93f343060bf61bc1f5fe11978fdc1c352540020 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 6fa412ea6b92bee33a7b54d0033d42f0e02d7dce..2020f0182eec2da1b93aa8461fcb8cfd97cb1bf0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 87ea65ddf59ab546ebc2ea8cb488985bf4c5c1d5..b625c5e23bccf0a9134ada74b29a6d70f9a7c489 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 dfaee4c131542eb97664b87a2888b191db6118d8..bd96363a209529a44ddb2fbbb392069002034c66 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 a054015e9a446993633281aa07465bcfdaab9f59..9397b2a6f40a9cac37e65e948581199a09671e97 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 401e025008ef40ab16e8f6c68e38492100fc267f..26474e686fb336e6a42869a2fb519f71a1882f7a 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 1290a55251e056a992d8f53ec84bc2e60fac1e9d..affd28e79a245df266ca2f8e8cdcf2f28c3e9596 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 b171f2b41cfbe1a992e1aff0f4094dc580a011d7..92bdf3670e9dd04ab4932dc83150bcd9c41c83c3 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 45f4ea0b91e2bcd33a21e647d4c8b342c60b6949..a590934705b1cdaaa12330ad0aeb794d1bf5fedb 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 f2b0c81ebcad29391ed910e90234ce21de9ac9da..74ee10a82c7437bd757c605efd8df226279e3095 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 9c28338a1f051059ac72cccc645921e540ca60ea..e2ae416a316a8743e29d7a0e30ba7b1fd0afb075 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 c42847c06ef1a855a047c0f755b1c01bd0459ac6..fd45e83ea39b008bcc8476f380c0cc57a832dad3 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 1f986a963fedb5e62233335aee9cdf51f76537c1..3450409ff15aef42f2088f4d77a99f0d24557a91 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 9fda9ffeb5aeb66057dfc5e6a2d8a763319aca10..f1df34189072f31cfef253f28a8f329514c44d2f 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 7902812d952f9e263be53633381cfbb27e568b1b..232f31665e0a3f4f4da5e0d2dbac82cbc091a4bb 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 5ca5a9931f309cd0ebde29e3ee8d0a98fc637206..a351ccd46ad5f007c790017b864f4e402988cf94 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 a21f1a58e9755335237c0d5d7a5ea207ff740307..3b535c499dbd08a9431aa24d3af7ab37ad173063 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 f1796f863d18ca9c8d1fb3ca32d776124116908f..cc5bbd0fdfc9593071d0b7105077d303316c5af8 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 095cfe9664a774d97759cf706a6bd23b068a4e54..628bf97b00f05f32e4e33cb12c9e120f24ad1aad 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
@@ -111,18 +111,18 @@ 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
+      id: disk0
       model: PERC H730 Mini
       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
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 c0991a0a264335d81d72dd5f2b1dea9cb099a418..ad7c9d6afe997dc9ecbe8056e1f6df6105b0044e 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 ab84da8a90b6519cf49502456fac19c1ee40d330..68987067ff5f593070f019f18630d66c8087b04a 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 edbebbe9a6ae2f611bb98fb4652ab76d046be7a5..905f19a6b73e7f3e13bc492be227da92773ec4bf 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 6c7650cf1332eda4c580a18e3cd9e40c6fa3d661..0a862e1d61c099ff93ac2e62e60f9c12342d9a38 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 e8289798d8828d12c77bc115404c86e8d2a62238..2758eeb52086e2517b3c1965ea6405c0a5de9473 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 fef93b23fb67e0770549a96f86b1e0fcba7bbe90..eb8f72d919cc24ca7d5d41b3270fc4654bce177f 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
@@ -111,10 +111,10 @@ 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
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 8bad160579d733d4f21bd2b88e39b46623778242..eaaadb2de34e37d200b13000ccdfd635da13565a 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -115,50 +115,50 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       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
+      id: disk2
       model: ST600MM0088
       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
+      id: disk3
       model: ST600MM0088
       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
+      id: disk4
       model: ST600MM0088
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 87e6d2ece55aa4b0ef755622716c369ec6c16a87..08a53a1db76a1d636635e5eab134dbd25da625e1 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -115,50 +115,50 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       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
+      id: disk2
       model: ST600MM0088
       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
+      id: disk3
       model: ST600MM0088
       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
+      id: disk4
       model: ST600MM0088
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 dfce70abf94657803d8385dd5e2eb5b0bf2a51e7..b911ed584af1725fa6a83817d61668c1b7e9877a 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -115,50 +115,50 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       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
+      id: disk2
       model: ST600MM0088
       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
+      id: disk3
       model: ST600MM0088
       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
+      id: disk4
       model: ST600MM0088
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 3554fe690eadbdb3beb8059ecde490fb89689a25..a8b20297706b7ebecb9f7c6eb9298251b6b1d306 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -115,50 +115,50 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       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
+      id: disk2
       model: ST600MM0088
       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
+      id: disk3
       model: ST600MM0088
       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
+      id: disk4
       model: ST600MM0088
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 5673b33dfd3eb02e52b41d6f8d3ce276f1903b65..c074c30fd0c02a39112b6f3847032502a7ec3ff6 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -115,50 +115,50 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       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
+      id: disk2
       model: ST600MM0088
       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
+      id: disk3
       model: ST600MM0088
       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
+      id: disk4
       model: ST600MM0088
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 2825617912916fb271c67413f23bf2981df242e6..b489515bdb8a7d618855fabff7c7d8c861249de9 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -115,50 +115,50 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       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
+      id: disk2
       model: ST600MM0088
       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
+      id: disk3
       model: ST600MM0088
       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
+      id: disk4
       model: ST600MM0088
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 c7a518ec7de86682fce774165a6c8ae82fd432bb..c5255b3a289df211ff7d5bdc61326bd895491f08 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -115,50 +115,50 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       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
+      id: disk2
       model: ST600MM0088
       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
+      id: disk3
       model: ST600MM0088
       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
+      id: disk4
       model: ST600MM0088
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 0854d7e76eca65486a3bc8bd0b182111e1c6b38d..a5d1b50208244ac9643e5b927ab0b2548c06e105 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -115,50 +115,50 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       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
+      id: disk2
       model: ST600MM0088
       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
+      id: disk3
       model: ST600MM0088
       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
+      id: disk4
       model: ST600MM0088
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 df5cfa07fd0949551dd172cafb0b2e09a8774db0..57c08f026b4c66a165d5370d00efdcb3add1bc3f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 042be8720daf82250c16c6518e0279e576f0862a..d5dfd9ab7cad777520b902d093c589ebc292a293 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3eec2ce1e4e6c12c47e1db2f2c19df5b20734ae8..bd9ae942f64112f5aea02c985b27373681feb4c9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 1c90b83c99ce53d7dfd36f2e30d1964177e88654..fa50eef7d5b9d11223456b3300610fb7ed65cac2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6f0cd16fd1137cb40d1c6f09f9b78bc8b5f0b487..2faa42f5027c70452638c8ff295f11f0cf3de9e4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 359798c74d8f8c9885de6c7d4d94dda4a8216466..e9a51e961b1605fd6495a0f40a65cfb14d635e5c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 27c46d2dd6124d90370d26afdd7cc01c8133ce86..e5618af8aa3e3fb397b543d68128b4b738b27d1d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 0844ebaebca0bdfbf13435051373af5430fc84a2..1f34d40067c0159802d25e3c2c5dcd86c33f4f4b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6c16283a54b38e81dbf43b70a2a7da5fc7a66c97..f11e154cdb7898a77e57f599fca3a65c22bac605 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 79a6a31a21c0e5923e6033ba5c4a7fd0f7966457..cfb77583ae91af88577e971b8777bd4acad45505 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9940b495abafbb570a055fcec4afc9706f7c8cac..d808b087a2a17c2b15c252bca67f157f5fb11ae9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 ed2c13e480cfd3b5694eb624de972add7f496469..efdf7c2166e3c483f7526f825ca291ccd5a6c5d0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b218181633ce44e553917c5a02ff7d3ea10c2861..a1ee72f60baa88312ad85f0bb07c7e4c39f428ca 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 32cd418bd95c1c36047d88a02a1071482174af35..7466ad58dc432bd86923b78a3321d076e289555a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 ed64ee64c73722ef7cc252470598c31b722790f5..0066d60a8c4c0fd33a5ef363483bbfaab1e0e9b7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 671cc327890a5bc34401e23ec7e5b5a4fa67d37b..9a3c8f1bb271f93a1564ca7babf0adcd7343571a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 d194a87d14e923228ffd58d32309599ae0c9fa5a..722334c600f4e850ca5541fa493956ff5c804cb5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 0528f283c875b1fa14028cd6e3fc5bb7dbc09c22..585e950fa12feb8be516655508b0ac3d8bb178df 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9b25b07b91917cc36d91e6adb4f7964a8e013432..2caf9c3ce7812f606c7000c6debf5eaa62a223f7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 30ff3619944dad217301b6158d854182d705dd91..df77c4f55bf707280f7d935f4e7ccffa3c0c7b27 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 d251492f7f627a73f10f830236bd7c68705cc4d7..febae2e28f60fa550b6321e1ae142422be03089f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 0105c053fff92e211d851968a15c7becb19ae9bb..022ab3c5ea258dcc25f1d3b7026cb805ebd84b48 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 c45908f205d55ea25719fb5604effbd4fea54479..a0c2765ac16220453bea113b01a6a5c475b44d5c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 1ec3b2df5cf1efd96c152126677a06260feac278..4218bb81fe6c34407840e3d5d27c2fbe7cb0731e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 c77ddc962826c0f9bd1aafb41f0253d09a62fb57..d312c09d0a41e7a8c39caaf344b80024c07cf171 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 75162902f5bd8fa894ccf93953e5b08ad1f6ec50..73098e21d44e5f7d8f55447f5d944407815635a5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 8046cb30d6142a3666f1a51cc9e6e036c30efcab..06358a5ac2cbb05cc68e9a49ed5b0a3823b3e196 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9b16e32e45799ca4361aa4f350e02ff8019a1507..ffa1070c49de36a3ad898cd05fc4f0ea6e17fb2f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 7c1ed19f3f5c58e6d1ebcb03daae7d5a7a8e62a5..1c0cfe690f9d6455b42c273a85e80614b5a8c8a1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 a432559bfe4ae4972fc973b086f3a42ba93b67b4..cc164407c3878cb20046e05ccbce19530a4c104f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 fbe8416ddc449f2b9b0f684ba39bbe5393731a2e..1ccaa7022f4fe29546364dd69942c27135b54337 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 ad30b2017205cb4d82944ffa34833f1ebb39f40c..6c302ea5c0388136c6395f6936924c74e7a69c61 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 56b0e0d3ea0ddc9c44d1c475d243c4aecaf4b338..2f465a3b3ce27cf04102b2d4f30e1ef305228393 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 705fe0aaeaa5b1549050013ff08b18ae55e89498..2d173d97aca6e832a3eddecb33f17bb2a6072baa 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b05dc176f4306973aeda771936086f0cc2d213fe..1c0e1f703a2aa10d16d776ca0e4102c8ab26268b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3ddb43bb2d115b6426d6559d3a15a288a96bbfe0..644a2f28b2a3d1ed9beebe13610c512684627aef 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 f40d0b1fce943a81b3372c121ef8d6efb5bf151c..ec9396942de70ef627710668b24467d67e9eb096 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6c9d4804ac3d191b13f451bdbed7e1542e0da089..3e29eec6826d1f988fdc86b2c3ac3f511fc63ed9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 7d797a32256a321f2f8eddc01dcead2c72f31b6a..6daf2f003c903e8b800d29516d5b0212b50c7ee6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9873f02f0fe8170fc6d2a47a119cbfd1dc41744d..0d7295c11444f3e3337242defcdb0bed26b97dcc 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 37edc82c499c5e64da9a9c3b7893f19d81d3db38..7b260cee91d792eefafd6efe6c2fcd0a21de078e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6444a9ac85dfb12615c01741b46fc1d609449134..f9710618f02abd05dde84f0e0d34e3dbd7fcac31 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 5af426438a66fafd6bf5f4b3a27998c85e0f5fdf..c80d0b72c0eae570c4769adf2661be0c9a6a3afc 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9b36bfa924210061b322f78946f58ed26f3e3988..601b38c645f10bc83fd472cc63ac3232f0ffd61e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -103,18 +103,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3c1876eaa893756506618bae4c409c3c64af1662..bcd2097126011226e46537456c11934e7d957f37 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 418c576041efa6603a23f12112171e1753c56343..6bcc5c5f49c1540f64e728d1396c4f140a844109 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -115,18 +115,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3edcf04477ac37f676d3c44ce3b1f8d17c8cf4da..fb90be2bdf2f5925dd3e276f6caf52aeaf2c2458 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -115,18 +115,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b4de5041d9005af8c8a904da1260dcba5297d861..b6fd9b3dc21a32cebdda5990f879709b02f4b40f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 915ff512ba747cb2c18608af78ec4f376d0ff2f8..3ce885dd5e25f949568f42ca985384fd1685bad0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 205d71ecb4757fee4abc0f93f33566fe80ca9177..cee1ba8f75f6a037a90aad05858601303469f029 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 524bd19b2d63454a062aa05f635a3585416566b4..40f27796d78e004bb5d5a1a77dbdbaf4ded2592c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -104,18 +104,18 @@ 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
+      id: disk0
       model: ST600MM0088
       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
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 5b9006c3d01b09735e033f357c7567e8a3a7a469..05fecb4668f4181275ef6d5fa1c407d6602de851 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 06dc3062ade620bf29f1842acedd218686a3bd7c..26c022c619d25a65c9d911c334af1275ee34a80a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 c22c62a30664635d5c489150ee71099a33a3395e..118e3e4c2b267ea763cc3e50352bfe605de51630 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b75130974e2f09278ae849aae82d31cc29f25fd3..d34c59c6dd80e8d03c5e78f8506b7b561655d3bb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4667eb61ad1195796f7df7b814c796cfd8485199..cb6eea2754d93ceb5258d705f26fd236c36b6a6d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d53b58915d2c73f89ba7249841bc39d95bbb66ee..6c0eaf0c024cb140921caf766428ae2f71b8747f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 345268a4dfe94ab569c03d254460864cf27ee643..a54995e2892fc2d5c0bb4e8810a5a6116bcc32af 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 823beec7f0fcbd4cfcf742681d1c708206652b03..e6dc5b75019912df4f967cbccebeaf83aba1c9a9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 0e61f8a3989625c3b7dfa52a5398cbd1022e49cb..ccd91597d81cfad4f913739489554673bed7ea8c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b3b980db688c4a1cf96dddef1cbbdc8ae2a1e047..060be6265848effabd809e426749b944f6bc065e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 408aee6abdf2a86434d62f54fe8e6796d7d1251d..be14a3bdc22e566bc46ca1ee08401678e788b365 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 59cc6bed9d7228d4da31358454b6f62bb6a80206..8ad6660df8f0098fe60ba9423164a4d491c3bd01 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 14eb2e3ecc1c6890d78512917cc279fa4a897ca7..35c4e2d1b96958ab2bd92a54c10203a69c70b895 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 197b1ab58021691bf6143324b3277f91b46147a9..5857df30abc19893d3bbce59304aa3b3aef003fb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a11644845ee526ed74d18912c85030af361e312e..32be37a37a0bf3e435424efbebcdc1d06942cc61 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 473be0446b8ea95f64d8aa28ee33d99b81a95c14..77abf8fe3be19802009e019642dc17c79161ebc8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 45af6bfd6a57e9691c8a0ce4a8b8fd4b91412d05..67c6df3301a03d368fa73e39e4ac58175e498ba2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 caea89adfa554a93b0181f3b7c6392b46cc0bac6..ca07f80a68170489bc5e37e1a22cc3bf8af988b3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9e14cd90e265953c79dbdc7a2c318150875326e0..4d139a17056035c5617d383745d1b631e0f09a1a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 adc138f8397fc0dd3f355a74728c2d2726b079c8..e82a3334466989debe8cfb0030b07d3e79e57367 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 79b4250026a32b2405b4995485a442a597a63f29..3c323011d763e67969538384ab19365484808a3d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ca0dd6ae8ba7240b86cafc327ee23138cb7cb72f..b0579ca88ea8522fae6972e5c8bc991f3a670fc6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7ff046be2112d54007319d23fc24ca964fd4af38..5b04e3d8320ed315100123b6d303e4eba1b60742 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d9a0953de04bcab6be417fb02335a563dbf11623..52847249bf53da9fbc6b044779262e3862edec66 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4c072f06418e1b69c1625ea694a2081c540fc2ae..33278ab880119b24774d14c267027ec7b49f8bbc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 f3d54e90f6616f7bb68132b20c5b8022e56bd08f..fa679882e9f20b924f24e63623b245de004cae37 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5b1d5bceaeab1fe9dcf840c1980de27234b45f5b..08e7ace86fdf172929ae34a720e05be2b1da4eb6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 eaa7c61eadd5ae76f2ee564512d32945aff34f75..f0e27de22991f485eccee7c94a29c4bb3bb5a1ca 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 de2c0aad6c516431400d0a94e2efe9f33eca86f1..42e9ac83ccd71452a523f0e42705e95eace942c9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d4e7c3f2474e763e40b2895f4a69babfa943ca2a..a27f4b11f4a5c1bfbfc5d077377c0f7d70b58120 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 c6f6f14a447a877c101285c958d2d820144f6ebd..baa95088dfc1e5c49921db74465ef6df1c64f3c5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4ce4bd887a35eb2df285821991dad499abac9f16..97d712a7bdbaf8f27a4bc93e5e5a1cd11635a64a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e9866e999eb342452515f8c16615488b095e7d78..ad72cab19bc15db68dbf425f6f1ff51d957bc415 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 79d26c6c8e8c0d8c6afbd0425839a8893850de46..129a9c499e4e0cb6fb9959b1b1de7e062ce2347c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e93072270fc6a5d55895ca58a35bdc5c725fe7b5..692313ba4a8ccf5845908fa78657a8643d0b9df9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 36f5e966a642119b507e1f9c324d848d2e68449a..b57c4057598fdfc05778af288c14d77c10d8edc7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5a64a70a3526e7fb894f5b3f53215a7cdfad26a0..3bd2061095072c976ca0aaf34df073bc2be3d0de 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 bd89b129150108583da29b150cd94b0f568e7eb1..4007a382448d1109bb7553eecbbb9638ff0530a8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9150e70bcc07620c4ebdde1645edd524bbb6e10c..a8406c9a358f80b8b79025e965330152497a2613 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 19842cc1b8fb74d60dc653a86c61f22bdcff9bf6..26413be49f3beabfeb05d140d7f9caf4cc651f1d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9726dd3313b6486fa6c64f23e565c14e04423f37..776606ec94db3d4dff085f4075dc28bc64624ea9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e9e73d080ab873cec170c64709e52dfb0a3cf55f..7329c32bfd7af225270090a7da66f3f3d9f7c076 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a28fba98ca42d669f388fc5ea041d66a68ea0888..699644feeb2c5240856fc218d049666e3f2a6c14 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5b359e4db20e737711176846ef0996767ad1e9cc..dbbc447092ba9f009684f4b0688f56d2a23c47e9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4510cee2600db85e7bc1e0543747f00f4c2d76b5..6f0121b5b4f755d0726537ce0deba4b003b10030 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 968be0e7f0322023b1e30325686a2c888f081db1..40cc0fff26cb78a8c5289d00e6ba05c7f00665fc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7ba2969a3b1e7a5667542d2bfd4728b190a2f459..ceec6bc575c09107c67e6f1efca92955c1a3acfb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ea41f1df5b18c8aac42704f2a9167ac7e08a8ccf..977b885f4b78f59764fae9c110a25b2317e5f6f4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a4a27bb809857d0b37eea30f34b180ef24831cc7..89af02fce3ce8117e0c9c60443e042e8aa561fd3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d8e9938ce8035ffe2d6e8ffef78897d193a84578..6e5224b8ddd71a8833672695677af83aabb73e83 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 01dc3774da3f8e6dbaafdca65580f709f523bf7c..bc62937e5eb27e58a7e955b9cd9e7bbfd842ca76 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b07b648ee131b02620df9ab78e16efe88752dfee..885aa9a4ddcdc55af38432929aca4a33c9369bdf 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d3bb0daf80665dabd5b8dea226ba5b15e00f87a4..b7f04f794c8f4e8944e488010630d63890506b55 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e57bddc82b31cda44826cf768c3f15bd15c96570..18d0f991680cdcc19c04f954bcef64a298b11301 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b29dac0214a69b969dc7351f15de1b9fd5ba78cc..6cb80dfaffa1a375195d17b309b537cb0b67022f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 db8fa9039d0528d8e3ed8cc6f708f746d6ff36ff..cada5d90fc573a1bfc4f7dc7bbfd008965eed8b9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 1a412c6dab8b5eb5ed47bcf10b59e8505cedc565..d6ac5b68358cdfa342d96da89a134a86cda7619e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 2771b705543a78eff9744e1ba155f21713460ee8..05146afef66a358145e5147ca07b79f3a4f02a23 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 be979c6cb82ed3f062c972bdf9e77a94d6b802c1..b316306f8f6e1716a885a561cdc84072d8cb1aa4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e8b098afd0bec3f8c1fca9c1ad0c299a285d7ee9..cb76336bca9711ae22adec013a2bbefe4c2fdd6b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4110a10da2bf54a17f71e83a47d7ab7577bf7c1e..5f53ab3c18082828233c068014946a0da262de4a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 18324769cefb512cc696cad94c58409928043d70..e7cea77f662476930b0305825e77d17ed44903e7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 609cdd0fed3b6d8878fc628950534f141b39b980..e25fe608ed92e49d41011f8fb4152a930ebc0c66 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4da9bb43c54f0fadbe58c088abcacfc77ee1a425..b84850bfa7089b676d828f3bc8a849e5a496dcaa 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5b0ed88fbac8830dd43f0742798e36c44640928b..8f9f1f5d664550af1162bcc525480e1c6fcc1e69 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 bf1b7e828bb8cc43b6386387df0d062b4c6f5936..f72ee06baaa8f0713dc948c63af67f25fae02048 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 6143bb37995e03fa169f91cf9a1a479bdb7c1380..261d2d18d873f09395182582db58ef55e180aff3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d3c1b05fa0f15b5f2e1f68228ae31c0ed20ae61f..ac16b1be980c5bc019f9c06672d0d24f6819b758 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ba52191ddd40fce9d48459084eb492560ecf7c9c..d89449f94eb6a4849d45ea06bb5c8a5db6a6d918 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 28eee5c7b900b2309b142b716895e1f50eb92045..6ffa34dba6715d6e55b3664b9a1fba975ad632e8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 98b5a067b929abf44d7798f5d1873def4e463182..3ae1a2d95f37aec9c389d2f552082f213fef19c2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 0840c797d94c4a05b592faf857939a0be7e5f834..af83107720f757d3b517fe75c5a3f2117f0d557c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5dd940c5c95992c14fe4bb04d23210d95465b54f..ea5d5cff11a6d7a0176d0a2b7cb2edd184e448e7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ccaecc3d04475bf47fd1a7f0174ba22cd743458a..5abfef91c7ce32a39d6f275042ae26e35fe047da 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 63ff1d4804d89ba44e58da05f003a3f345338994..b8cb1871eacb8ed3155e7ce01ea6dc8c13aafc9a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 c30813536a921ab48669ccf3d44189affdc2bb57..f7659cecc5a97f0a64765310dbd14ce75f500f73 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d29a9b8858d59650fb7f5c0da07e98d208a0174f..80a55869413865e08a28c6d6f3d400a6d4144218 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 48fd49e2ebad74f1dfd0f415d94cb437859ff136..0100a027787a062c18287db17c35ca3114ba7e4c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 43f93e6a6cc5857a269a2343bad6764fc7364675..c16eef110d4826b7e2c53b8ae654f1403990a404 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 842e4a423118b6d90f0de2d96fa92b62e32c6aae..c9bfd3483b43adda6e0f80798768509d2d7af758 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d1968f5300460ba42fd11ea2ca6cf5343e56287b..308efbeffb94eeadb112486e4a42ff5281a50a4e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9c8b919f9831f41cc3279b1ee5bb374dfc6476d6..655a1c8cf9c0de29042aed113687ef9fdf54fc94 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 493ed93b866dbcd08fef56162e368a725becf520..a471cac5b91365a7b584425f212c9d4dc59f4dd3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a718aa0d8c9abf5414f6a5647073579cd359db50..ce1961a4bdee8a384b7ab8507ec49cc972e75162 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 dce8c9100d36e86168895719ba87b377eb64ca40..7d74db552581000fd7e02f5041e80c246ee7a37e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b43869e90aaf6c82c7fea628d34ed21e19cf41bc..5acc1e1bc404e1d7e18cc66bbc13141fce0f0046 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 da6d4431428218dcba83533c43d44cdb432c6b54..086bbadc719c7893d8acb1f1047833a216fa1005 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 dd4ecc01365b470bdc64e541fd23d52ff21fb7b3..4533fec4011c6e8e9696448436a42037eae23adb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d7221947ac4938f444f712fc4b215fc1476b0e35..b0714bc8785107685cb0160eaafe2df01fbdd49c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7c84b9a76bd71f74ef627c6489f883435b61e058..1855160b973efc2f585b95d69606490c60c46d59 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: SSDSC2KG960G8R
       size: 960197124096
       storage: SSD
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 6e8b073298bc5a7a636187471e4b9507c6950f40..53d41a9ad9aceb21d8a8862e8988c1f75c919dd4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ce742003bf24b8fb8ded933f789f8e329b828ec8..70862b18e6d0b55238fa9c13d63e2878ef777374 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7e82322f27e91a952ed551f819edd5013581ff7d..4d8e6c78ef160e22bd459179aa8c9914ffee5e25 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 62370cbb9e27af73a63254a87260644e3f3cc01e..b31b22b53bcce61653b6e75e19d37d5cecf25b62 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 3e11fca090508dfa3c54be7afedad45ca6946c0c..82424d2f37ff2f347af9fcf5cbc02888d760b1b3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 2bc03f692cc6c3befbd380f3aba5da8ac4482c3d..cda0e655d746471346708ff2e82875d48dc15c85 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 20e594c14fcc135acbeb318aaa3ea0c81ca48f21..00f53cbaa3b25929931247ccd050325c575faa5d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 460be62e02c4d76df6867769d8614cf75eb09463..a6c27f857ddc95820f67556c78f1e4bb8bbeccd8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 702bb59e485c0e34dfb2acb1590202dce57df614..15bdbd1f9b5a9f3ba15834c2eaddbff5cff69554 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7c5062e956cc4fb2a043bf88db1ba347194fc122..f5ded0d64c093409eb87a4469b3c4e10e524449a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a298a43035ee876ae23931d0d105cb156be3774c..1ce55ca69c1e88520329555080ae79ade6da011a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 f83ba4c2a8dfbaf7ee4037567cacf6e8c29c7bb4..bbb1f3dc36d6cf9d5afaa210d3783f7eee74282c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9592691f81d8b2cb05f46192642e5a506eedf8aa..d2b64a7b925deca2f08cccab4247cf1e62e0cdd8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9f541c82e9d4942b12d94dce15961f4ecd753f62..d35dee254938f2eb533b8b090ce48f288cbceb56 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 8dd1611471a7a44977adc37699202d4e2c763218..55b4830f5a7e1615bef9c875a06e0cf5c0994a6b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 da6dd26e4cb81df389ed95482c26d2b97ceb4805..28c1a78c6b3c2fb8e6d2e5406603bd080284e716 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b895526a7d667193d78ef5393e2b226f68329392..8a08afd19736e851111ce223998c6a8e78cc3953 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 8bba053de69a765f6a9961c748df07a3f3584355..9cd61d23db2d59347eeee711bef9903ccdae43e8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9245ba48468ac70f2cccefcbb7cdb135fd28cfe4..92c7e7bcae5130b670c64350c1e1452f44e54e44 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 3e1798654a288d53d113ec5d0188a5c96119f48f..03acc8fe5a4df85dcbeac14a22b24b321b8bc0e8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 385fc4fc44078d0e97e6591b4e25521085495a36..da37e0ba9791a9b79a0518e63edab79c64260ae8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 27cebe9f6a85ee4ab313a35390e8a33f5f140a2b..013e4ce669cc8e0467ed8da46c587766645357dc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b519dc4816db235c178c30ffd11cb72adeffefe1..f28b45e3d4745ae033338c7c549338aa99a9888f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e7b70ae95c350f70f9d978f36ca90ec30da3af4b..7628232506471ee4603e0e94e70e58adba87b325 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 f157462eb768d3c576893d4e584f0958f5686b93..045609d5796361991a70641722259436440d6e49 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9107c9bcd26569fd316efe7ecee41cf1a9f4a030..184137d77076eed7c4bb2fb6518af0f1c38d5382 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 2e70a76d3a9f8229fb81f6c4f1673c5759d92b92..f6155b1f5699d7c2386058dc2e56894b80ac5183 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 85ef02ad2951758f932f13b4658f188a86c8325c..b49076f353adfa9dba34d196e33d8902057f5e3f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 0c6f2d0e8638a71f80b5a53356df374c4d0d4d22..5b7190fdd37390c10322907dec1e2423049e502a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 aee42d7be21f349057332f57eee1e32ae6ffd3e0..077389a9c3098d78fe3b1b4bfd9573b8e825e349 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 c9d518d5496703de094508413bbc65502f7cb683..fb44e27870c8714c7e505f1b9f1261fb57076622 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e89ab349f55ecbbb25d384a1e4836eeb3a1dae80..1ddd44d93f01b9237b60c9c3db647ed76a2699b8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 210d0aaf923d3ab8398ccb202e83bffa3d2a4c4e..1e815325ec7e7b42a93b97c9229605ec052b2207 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 92e4dfeb65e5e79c20f2c547a8606d2b60bc6fe0..0b82c8ba0977f14fa8095f42aebacafafd642354 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
@@ -65,18 +65,18 @@ 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
+      id: disk0
       model: MTFDDAK480TDN
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 156a83ac019f3da89d6f03f3caeeba0228668f6d..7ee760b0284b889bd0b1aeb0b3c743ad19c115fc 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
@@ -99,18 +99,18 @@ 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
+      id: disk0
       model: KRM5XVUG1T92
       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
+      id: disk1
       model: MTFDDAK960TDT
       size: 960197124096
       storage: SSD
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 5f44c714cc28796d7e4a56a8268ab804a6e813cd..034cf2f4c929a85c831e514076fad0c24e9270eb 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
@@ -99,18 +99,18 @@ 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
+      id: disk0
       model: KRM5XVUG1T92
       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
+      id: disk1
       model: MTFDDAK960TDT
       size: 960197124096
       storage: SSD
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 9470fc553488f770ac22e3af7db0d1b6e468ebe4..fc5cc25715cb31de861e9de53eaf02211ebccd02 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 94b8d24c4e60a21f191264f601abe3df8f891273..19d13fcf02c5361b881f3cac0ac3678efaf067ce 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 42e799366a761cc81eaf40768a264d953e458fc3..d174cd5b838f7ca29f37d986cf951f590c9c0d95 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 f2b6d474e8666ba3e85592c93110cfe1785903af..e7614521e7f33154922184acf21ffcd1c01fb597 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 1340d9c34cec718080d17373c1d175095de4419d..cd42555965ea9b22539d4239d1195b85fd8ba025 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
@@ -115,10 +115,10 @@ 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
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 67243b8b32aafb5635dbc338c85723409377cf24..60d66d53e70f96488375221802a405061730a0a6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 16f5d8a74dc10c7b548ba0bdb395176b5e94b6c4..583b0ef72f28689558aa5cd5352ed9ee34f2f85e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 5c85291027a39ade0535e02498aff41849890b9d..0be8b20e4c890009a7ed1657f601d55ea3e9ed9b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 c41bfb0c2b5e771e373c5560677e804e65109470..37a84eca667c67d3953b99f29eb23b1ac558d28b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 fb3e040e9cb51a2fae7d69704fad1dec47587eb5..62dc801eb79ca0352b9298fac4cbbdc1c2cc67a7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 415646201f5e6b898cd1ef8f453ab31231b2bd2f..c8d596c220165d5028df570fdc0a54d7a5d84a13 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 768851e903bcea16ae4c46e6144d4bd737623621..be7a6b93823e0d72fc7730545816471d48f645ea 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 c74f549c81ad231a23672a5c937fba47b025d1b0..9309a68f1715a81d1e02d4c35eb1e13c1d5a90ef 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 28cbdcc77e57d1f8fc0546203603d1ef0b2c5b15..71b4ac164ef906c1654dca12e5e2e589ce08bc06 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 3e3a638ab3e7427104aed44619437f02a75d7cbf..512ecb5e0b0620baf633a21e292c69c08edb5096 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 bac18dd736b7a63570f045fc809930d024b9b7e4..bdf2f42e6fc1c94b15979249e9c7aa081877df3e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 16e9d523ab7adb6fc2731065a56813ef3d438147..0a0690b9e914f6d2d694ef6607968623a16ec583 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 c75cd0fcfbf5a80433227895ee1c13b875ea85bd..25c034ebb55338624d7f19ba6a1efab7e2d8cc17 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 001c319a849da851a34ff0582a0a40812420f173..ce013780dda09fdc5e453a2c19fa392f8d620ac3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 3d0e9035f0ac5fd08c3fad54af7e5fc4b609142f..328c2a93317b4c1898f88a6f27ffa5237804012d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 26f0a4ae0e3f2c471838aae8e5f246d367c45e76..7d339af373aac45d331726badb7667bece71515e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 848891a7982a45c5dc9d09eee14da712a772f6d9..ffadc28eb70b268b52ba7c99414755524911ee81 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 f33d062fd5c5f01ad1fbed148aa72dda7ce9cc32..22c5959aaca46b6c95d0e10f5b8bffc5d44553aa 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ccadf2d6670cb613b89808e02c523c285ab0e8bb..7577ed1be45bc7fe3eb04bec8c57c1e0f06c60a7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 e3837e07a919d08154c6488d5596911da53599f2..0d6857083fdc8150fa070a67cb3b96a6cafaf587 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 fbaff4ca943c9e404ab05c8546944edc86c7ee61..68803caa73ea9b738d632aefe667aeeb30b84c41 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 05ee72e2534868511e0a5146e598f60fa7599726..9f49c26e8be06762b903eff03ce7b25104c9a494 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 5ca2650f3980261369ae04152cc812ff70f6f6fe..ae770bd667f02e68737ab5d1eb85b377e7467800 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 75843198f9cf117361e38afd62a7c2131fb0fb08..b6abbf337f71dd125f5801b6b4a70a55bacf3d6b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 09b0ef8736f084eff7876d5abd6367b66fac1099..adfd7606c5ec5c54d60d766c2548be6490e92ce3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 78b3fb7af637541bf61508b0155b0ecb92703684..82ac535bb28f6f0127a2085631dd0b6feed43d57 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 0a089a5808a98e2dae82a0c8e14672fee4e6914d..ac053db94ca9d674a7294f79c4156b4d56307495 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 4d93176e1e20c4c18509b77bc4eafdf6a38a64b9..1709bb2494ec4080196ed0f083cc59fbb02638bf 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 cc8352b5a5536ef62abf36419596723dad169e54..f444a76fbf70a40f41f3f75c10b3b65f74604ef4 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 6a30f75f8dcd207139ff81d17ff7607143df93ee..0ebf80a78a34589d24d48f4618402d41e0ef2d0a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 15f9f628c4a1f570ebb9c72eabfb0ca0e3f2db13..bcc7778501f0d31d75fc93bbc170093c7979c20f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 74459b5f7c1237588dc04c705dbe52ddd93030fb..b7025d2f4889848643065991dfadf15f2182f272 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 1482dddf8dc670cbda0a4ac62fc72b3db0d14035..0a4fc9bee578550723ad779c94f720c29a383f95 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 be3eae60a0ffcdae91c62737812ce02f1c5f212e..6b4dc86b0cf435e1ff7e1860f88a1e5ed6a2fc9e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 36c37085ea146086187acdee6632d02dd039b1cf..deca6ec67d3ac5a0ac65535e736d7d0810f45734 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 65be16e708221cc661b7cb8804810eed10bfa2f8..9a00ba8078c7c5c0209beee7313530851460772d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 6f5d9ff259975f18dfae55d9c2fea546b53ae5e4..289a5054c0b78b901995221b3c6a2b57614ef27e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 25d66295c450e8fed0ca0eff94f3333922c9fda1..58cea358b5226d508e7e75d39d2118e22512eeec 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 a2bab55ae55487842f6dd6dea9fb7866c357ce46..eb4e2924512beaa2bc4af5b013b79a71dd43db38 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 33c5c007fd6632e96e9af3785eade6f1431d38fd..867e8f8ebb10cbc95facef7a4cee74ba3830ae46 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 0414b4bc1c4af8e4717f619266d396a4ba864d90..b335a8eec5cc2e32cebb4ded41bd787748336ffb 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 e84bb5cbfb450503848b2591625caadb57ef7257..59c7b7070e609712d139012ed7218b62a83414f5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 aa98d465ab1b747b03d8b775ec12a0004c5704b3..ce908c21eb78b5d849be77647e514baa67cc2204 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ea2a62e1ca019fe14eb8178842cb36a221f9e71e..ec0d62be87e788942b91b0c56dc4bc68ea961384 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ee53feae6e164d202b1cb5a93366c333aaae5520..ed3711972751d1f9a5078010b63bda5466469a11 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 2154fbb48b8789414b267d360c7c03029f1887d1..71b09fdc04ce1ecdb4af3371b9bed83822922055 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 59a900fdbb9d7ece6e6d76ac4400e26f47961ce8..b3373ebc991f115015d1b87f65689d7617ff064d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 4ece96247a7a1fb4adf05f7286b092e14da27771..38913097790475570a99477129719945e90158f0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ee2bf1a3c2af63d9d6f6f7fdc897e27d68ec6b0f..9d31692d01788c43f1827e43e149112019cffe9c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 919a650dfa4450c23755fb8ba872fcd8cbf7fe28..0edc30adf240b5cf9f20b5be7d86fa482134cf40 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 6469c74165725bd19e186bb298e9ee2eb48441e0..1254bd7bdb06bbb7d265304ec6b10ad50988f9e2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 bbaac767647e915c0bd053e8be8f76755ad5a54e..4a275ddeb738de93ba1c3bad01bf284753c3aa5f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 5b80addf5201e39484c12b4336fb2368c68d58f8..0cf74d7f731f3222ead9c6a88672f3aa8370f082 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 1fd3a63bc349121f16ab16184faf2b3e5db2e555..2f6661d9d4e70a6d281b7606e66c1c2e4fb3b15e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ef799009422907859f305eb762b4fd118f3b9742..bb725a8c2f183b1108574b6abd4c944a5fc4a188 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 1b4d90ce1e3cb7abc4b4e2cba685011f2a4c9393..e4400665b4af7fb8b2727634b31d8109eeda9c84 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ebf28813bcad8276883ffd3af22ab6ad96f64bff..45a42bb7bc836ec15114d6becf8c9ca04a5c5aa1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 0e5bc1dd95a46fa65b3c27b495d9c5ba5f588e03..06e72dfcf1be50da78ee2fae64702ff3d5bc5995 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 b8dfc534e7c531ecccfecc33c14d42f87cc18a2e..91c5dd6630dc207101fa5ea03b8ac1dc2ced33d0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 b1b5e69f733ebe5f9a3698924b7c32ec694b11bf..13fac8c008365e15ea4e8459ebd9de58cefaa1ca 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 38bce017dcac3c937f424a0e04e8ec039766f3b1..8e1375b1dd01a16fc8384e113a5083cf2be07c94 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 b9375a7a903d1aa9145278b7f0bf6a7d14684721..e9987b907b2b1499b73db3c8570ef21d96187a1e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 d6e3bcf0ec7fa77eedb49377a86eb0218016b1b7..980526fee3e5fd3aeb4b4ccbb0426be3d4a1db3c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 99c809d994d1fbb530e786eaefbed8a042b3e09e..b68743a160bed6f98415b47e594aae29bc0a669c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
@@ -76,10 +76,10 @@ 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
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 dd0b4d11215a73eaf0b770cbd821069c48cd62a3..bfa9791ac953442fd2f0e3215e098c9bd82e4f14 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 f37fa2cd216121a454852ea5180c833b99ae9f06..ae6f4a1ad62b81be3518cbd8c639b53912a5807a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 55adba3c217341f56461492497e702a085b336b5..e20de0c2dfc9ea988d068ecc2acd7fc086f3efa3 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 8a1c6365d2719190fde558e5db441f8dc235e079..19207fd3facff4f2523beb5b1531fbfa3433ebc7 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 b3ade7f0638e1e5cbc832240ee79a8c868ebc249..6d08abfdfc91b078580e03615bf6c376415a54f1 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 71e64ba2b43aec31e2673d1581aae300be64fc1d..06c7d890bfaf3d3e85b3a6ceff28fbaaec9aa1f7 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 b0dba705b8d3055e27376b4060a391e50c9e4f51..6c9f5406362f733a962179154b62f96421dabe75 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 87a15b06c2610d76923de6209ab58ed027d08998..41e40e4ce92b2275ff479bc343ffc9db3514093c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 143b5163cc36a9baff553f8f15918bbd59db39d0..4cbca1b5b7b07f33b3874b76046908c445c85028 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 e6356b1560fa538111173148065edc291655b9cf..541181d53d2d3957c6eaa0844b5b7c4b648d80f2 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 b448ba3e8f796cbc265f6b4f4c35f00744a11997..66e979a3eff31e91a766f18530f391c8f9746b84 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 8f50cee66809a09aa2f72ae46893bd46d574c66a..49eec5435b281647d8b73a4dd739eac868e6e1a1 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 ab98e21102f755a834bb9357d8c25bdb16f4454e..70d6ae9bc7d2a9011a44f0872e781b912d6622c4 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 3c5aba762cab032ae0bd6da43185171cf2e7a2a5..7c9c60987b98669397510e12adb7b3a8c1e021d2 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 6dedb846f27a22247a6dd1f143a7b3ca760ea932..aaa18292f26b7b1d9878f11b330d19a362190e2e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 ee30db865ffd57c4a0954a479c90be4e05960370..87a112373ebc3be243f5cbcaa4cb702abb6ce0b2 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 0e4378b024bcd6de0a944ebc4cdcec6caa122cac..517b0eafd470f46c163519200b0c30039f591df4 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 38bf7bce504b9d2d1cd85802a52d5894059df8fe..21ffc9116443f2f6290f1bf23d2ceb13a677cd44 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 03ed42be29e200242815d7e815e4bdf51571d325..345a30e1f8205ae7831a6baf0f09f20fbba2c03a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 13b48ce81b5e7e2e9bf02d8740a6d5b911e8356a..1160a3b53970d668308e90c7ef57515bbf6d723a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 dcb755cff5405210b99fa8172f57449df87b3274..645599e52ef2da1b63994de5d8d767f145181650 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 aedc96b90be8578386a5e8f78a06e6bcc9a2f7ac..2136fb54ccfa5a6b3f7d0440e4dd8c97f9d60b90 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -82,10 +82,10 @@ 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
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 416ced84d2144a75c7914e7fb58fab3365d45538..9ce6d95af6ad39e851c25b6c22d5de982897b092 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 13caca7d581963d889564a23c72ebc32e148127c..94190b569fffe35af3664fc3b4f3529131e8e1df 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 81237d70c9d34d0dec1da907ff5fe423e009c06f..be68c8010ae7b2578215523d41b9f4a80b9aa775 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 c47f9a2ef560d864cde3303f1b7405b3dfdae030..186e89dcc98958c6143327e67fad3484393168a5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1f090ca3da69d45663f891a108c206faf77ca2d0..f6d34e6d15b509560ec15485e2557f1847ade4e8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 226766f59dfb460940a9bf1fb9f23207c38da6f6..26dc311add7507f39de828b3da451e0209163d6b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 3a8c5c75041073d346d30373f1fe7ad3e18854a2..a0344e112492785b188c2942ef8b68a6eba6e15a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 f97ce165ff04e46262df0516e4b56570c77e68e4..cf0ef252a86b435cd9d6c52416d27bebd74e1eab 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 4d21380941a4ab65a916c62d54ecc4cee55bba27..6886e06be1795dd12ec9474237f50ad04c7a32f3 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 f81bf418c8cef93c06e62f00104158afd3bee33c..57ca04009355cf984871cfa453a4640829b6f2ae 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 b9b4356df25c162dc883daf74dca5d670428d1f6..54141f2f816b897692c188e936332a34bdd9ddf3 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 9ff13666a304ae56cb48a362aeaeb6129e183ac4..c06eafb0d5a12749e0a5ef0ecd17ab205fcd2738 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 c14022be364b2769d4bc4fff6ae11f6e7b1a06d5..146b35e990146a1afc481a8bfc836eed7f4bfa4d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 3d119982e4230a9e164706d506cfcf2e4576cbf8..6a79c57ca7bc0f89ded92b1a546aed0660ff3ef2 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1da48f72c3a1227b5d9a50aaf6b98587ab9bfc2d..a8b538db54fc8750ce3bdc4ea6946fa42bfbf1a5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 acb8af7f5e417d6d425018726acbf49d612ce57c..9674ad756ceeda4fa200efaa23235bdde5bb59d0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 463964e978bacc4a41dbfb74b1abba1ce9962066..807ab83533565d4c7693bac60537777083029178 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 2895a2b803e25214f4fbecaf4d359451e28cdef6..d894fc165303155bf5157221da5b8e936fea33d3 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1722ee389fe7c94aeb29822cfda2e349e6d6b5da..5f1365a6408ef8ac740ed6e1e8c3c4f4189bca97 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 69b23c416bbdd6999727022aa1a688ffe09b57f4..9736c3cf1e7a8ace002920523459f6538d25c87c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1aee6d8e8aa6d8a10c5e6f0c4f54a1ee96dc8d14..e1c5d51be7587ace2544ce68d9487061dcdc070e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 fcb687497368a4aab0ea0a44244310d91eedbf88..2d901ce8723d1ceca6b3425d81cfc2a88a09918d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1a04acb001713bf231fa04ef6b80fb0a35aab3d7..9cfb9cca78166060d51f7a7fecd325718735c9dd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 3c155926a91ce0071ba5f69b6190d0f7a34e14da..306fba641434c912feb99956012bb9cceb4d1ebd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 dd857e5330227674176ca9a18edef1e361ac0b79..a1988195cfc242bd36fd9ffac3812914aecadb3a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 7fc4b6d3bc768af5598e898fbc38f3b7bd9a43eb..4cdef17cff882733715c157d3f433767ff041fe8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 4b2fafaca212e87a7b633e31c4cf94c5ccd6c3f3..c8341beacab07563afcc19056f0538f7474a6a54 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 8d2e652986c1603940597fcde8e1cfb84e289d29..8acf7b6217a148f59db67e63754c5af5bda82f3f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 023e94ec8db37bc818a631ca7af87ecc6edaee45..cedaf6f02ea89f6878f828a09f278d7460e9e996 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 b75902a667cb068f20391595cd2b8fad349d68f7..bfa4541df283eaafa61457bfad63cf4f377aa9ce 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1a8c3c30ca0a0d383809c2f4e8d834436b8d8f78..7b2f0625aeebc4309c6e0ce3f8f99ae17c79cc42 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 91fc08f3b4a1c6f56d5a1bb5dd88c1264228b06b..8cf93bc84a8edfa8b840e80b88ef0d0b62b554eb 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 515c00149a5b3f29f75db7d84557da4eb23a4348..9caa3312bd99ab90da3c09a4b08dd7f4c9e57d81 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 5d89fd0905cdef491f60e982a2b4ed3e351d734d..f5244674081df46440ca0848854c2e4aa7a3bec4 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 c983ad3ddecb78d355286d2ebf85191841e3b406..aecf0c5fe341b0a8e2b4d671b8d70695ca30aeb5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 2008a9c538544a85b27ffbc53b7979b896c0dd2a..f785df0092cbd9f1dc54e11df2e0da1a42755339 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1102db16a6397d0019d361d4d89148fa9a66f150..7837dc485b6f6044caf769634a209a60bceb2222 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 6976dc57cd8a28c909bea3268feba32c9a835145..3166adab6b693cb545ddc1ab5bc20f882cce03f9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 81cdd64deae0a4344017d8127c72106baf81f9bf..8507c2f3d1af45206b337d2a792f75edb67fb616 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 5a626465c110223b3548da152d87aa004431f4c2..d235a69790c7d99952fc99935ecc9c6910301c84 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 d86b6c94ccda7f01d9393e94a21225122a10c76a..2a765de72c1dec2685d233396a98cd5d98034e03 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 a2217849574a4b48dc1f47a23b14b57a8b96558a..dd8237dbb6f09b57a8c798687b9911bb36839d64 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 4013962078e71c8d23d73bade1044cc352a749d1..951c427acd620e2a46eeb125f3b26b83f55772a0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 27f3690c24ec36f96e71c275683ad3e587637c97..995f78e3249eb4c830c56c55a754aac914104cde 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 b0b0c046a9cd83e8aa3e93b639dbf9bf112528a7..81c2658959e474aadeeb09b3fc84181fc4f36aa7 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 50b04d89b7bd4ef5207419e35ad3070f3d8945c6..073fc57f33132219ec673b3c4bc33d6611c4c5c9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 63fcf173229f199d6f3ca0032d5ed881be4f31bd..8cd0b547535bc1fbbd922951a5a9680385305b86 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 4b07a37a967d1bda95b9eb95236183cc62521f8e..3f51fe3e1f9a882eb15d3dfcc583d47ee4cad9d4 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
@@ -83,10 +83,10 @@ 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
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 3e6e52174b5ae536f09bc0ab57d768e88f004568..39595e75c0cc2a62b638665a35362b6bf34821cc 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -84,42 +84,42 @@ 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
+      id: disk0
       model: WD6001BKHG
       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
+      id: disk1
       model: WD6001BKHG
       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
+      id: disk2
       model: WD6001BKHG
       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
+      id: disk3
       model: WD6001BKHG
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 d7d68c58919066ff00e658c4543982340560a126..12f034b65c93e16e5754277215dd1fee7ec8297c 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -84,42 +84,42 @@ 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
+      id: disk0
       model: WD6001BKHG
       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
+      id: disk1
       model: WD6001BKHG
       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
+      id: disk2
       model: WD6001BKHG
       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
+      id: disk3
       model: WD6001BKHG
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 ddb7696dd62f91ef1fb2e04521ee18776f835657..7eadf78854176ff4e8c05694aa4fcab9ffb9a6b3 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -84,42 +84,42 @@ 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
+      id: disk0
       model: WD6002BKTG
       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
+      id: disk1
       model: WD6001BKHG
       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
+      id: disk2
       model: WD6001BKHG
       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
+      id: disk3
       model: WD6001BKHG
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 9052b9837331a76682135cef04732011e578baf0..45e882d0068372de3658413c07110fd5aa0bbee3 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -84,42 +84,42 @@ 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
+      id: disk0
       model: WD6001BKHG
       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
+      id: disk1
       model: WD6001BKHG
       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
+      id: disk2
       model: WD6001BKHG
       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
+      id: disk3
       model: WD6001BKHG
       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
+      id: disk4
       model: WD6002BKTG
       size: 600127266816
       storage: HDD
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 96765d603a1f60bd672b17aa59916e37109e443a..d071b37ca23c3bad5029519a98c8a5398091342c 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -84,42 +84,42 @@ 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
+      id: disk0
       model: WD6001BKHG
       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
+      id: disk1
       model: WD6001BKHG
       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
+      id: disk2
       model: WD6001BKHG
       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
+      id: disk3
       model: WD6001BKHG
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 5c5817a597404360ee5024db9f0075406bc428ed..b992dfc048fe41bfb8a98840eddf3e27218f4bba 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -84,42 +84,42 @@ 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
+      id: disk0
       model: WD6001BKHG
       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
+      id: disk1
       model: WD6001BKHG
       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
+      id: disk2
       model: WD6001BKHG
       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
+      id: disk3
       model: WD6001BKHG
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 4f470ea22ef66c68e3600f58d2a161a784345b99..4ed6a6729990638b7fe9d0669a9335afcaeb1c16 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -84,42 +84,42 @@ 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
+      id: disk0
       model: WD6001BKHG
       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
+      id: disk1
       model: WD6001BKHG
       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
+      id: disk2
       model: WD6001BKHG
       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
+      id: disk3
       model: WD6001BKHG
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 ca1dd968d1f5efa82db07698ce61d3ade93d6abd..f49364a403d30e13ff7d2b8ab9f9d51fc98bb96f 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -84,42 +84,42 @@ 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
+      id: disk0
       model: WD6001BKHG
       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
+      id: disk1
       model: WD6001BKHG
       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
+      id: disk2
       model: WD6001BKHG
       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
+      id: disk3
       model: WD6001BKHG
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 83a22d0e7496ca9ff2085fc415169b85efbba08d..829c913197f74c43e61e74f146a820d5fe5fc985 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 bb8fe9b3d8872b5ac56a945bb0229b2d9e82c725..2140717e0cdd11a5800e7fd90f07f9b284042e15 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 1ce99ac3eeb36b626864f0ef48c8abf0069565bb..101e5c9205da9511ef00103f316318a060a1994b 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 a6167edfc4af6aa87575adea7adbe9fb392376cc..4098d24f6fee041115b41559d2dc5a044e7004da 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 7d1ab1893be40014dd8dfe091efd7b7cdab17c8a..72753a22e4d320cd688c90945be5fbefaf999ad7 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 87cc40652c66daf8e035ac725a25e389f0896943..cc3602d39ebbf1214191a100ff862dfe13bbeb81 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 c05283082ae847594d9d161d2fc0f1b9fd870880..b1c3c0b07b8637e5f78e592861635b919038483a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 67b9cef09cb33c469e6d3e25d5b95d01ba61156e..735d71980ecdb36bd776598f70de18ba2c4cf651 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 7a78ecd8d7687ad2bb17bb962640d5397adefed9..a188d9e03c3eda3a2f12a4daa283c37a81d556ef 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 8fc3b4dd7619da0a0bfcd515d399083da68e3752..12db91b9152abc0d0a661e8741075864ca6ba39f 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 d0be98aca14dddd5842b4079383a8b58247f3598..73643a91aadad7bee61ee11cb8617412712e260e 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 263d392555b4b3a7260cc897a2b979b60e4a18e8..173547b478d4a2b175758eb3d117f3597d0d43af 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 e807b8e718fc09e5272df770947799f8e2d17fc2..3749953a97d7d633720eff6440efef1ed5d66dff 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 6c2716e250353b06c265c3683d81209fe663e9fe..7eecf5cdf7d53c37970b3e286bbb18e2f28602ef 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 b44471bebddf3af60cc93cbbc66aa7a0cabcba1b..b4030b5b4fbd490b55faa807859abab77a13495d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 839ab0a556537978cbc7eee923d08f3da92f2ee7..c84a6a0310453995ebfc8bdeac02d496cdf35ced 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 bae54d87b135069291033199ecb68226b83c10fb..7bceb72b251fe68c7c5ecab5bc6fcaac268fceb3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 0f8665ba2a7c849be842c3ade1bc90753987aa51..78efc72b3992909c1269baeec1cad310fdfd096e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 e9e0e6337abaec12961e862e8603eca1e783acc0..499160f322bbf01d7d5a53c8244f2e2da61b5090 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 51655a60f4d1505ebdea43b1be907c7ded05f02a..13beb6bd54fe123bcf66cd838f472eb79b8c655e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 adce161631a4604920e549d51f9a99bae1fbe57e..bac9aca6d5afe451412ca73d38c85fa66756f1c3 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 8746288187819248925e64827656263d5bf5b41e..34aba9d74dfd011f24dc9def9ef589135357fba5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 a863269ffc7bc67784567feb186a76abd55171d6..bbbe1fb8045c9c33d998b7c34a9d88a2a588abf8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 803cfa65d4aa670bddf26b49233e7f4c771dbf74..70e9876c878bb988228658c026d8cf3f3aa977fc 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 f5b1be6fdb8f9ecbcf42d60ffc1a78d89ba64a7a..2b3b258cc014be8760b46a0a182f777103c1991e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 b04be60f60f9b058fb9c33dff3b0b4aeeaa1cd84..e06486173e4df0d6365669b08d03311c72b83906 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 ad3b4a830fdca57b495f48f76a6a684a64eaef5f..8128829da397192c9cef242e88708fb6c58129d8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 4745a6938c6a4fd35ab996a46f76682ba6479e38..7881d40b561cd9799e1d66a2b0befadac753d4c4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 f3bafce1ed7e977b818520dbb5bc87878ebd63ec..dbc52954c9f9fd4353e954f6e919b71e578dcb8d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 7e94a0a18645907a1d71d65c84d6482d72d4e1f1..cb0d6149bd7b40ecacc013bb7341ff0653cc5529 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 e05248a1c1c5bbca05a6a635150e8951cd4e9663..9f5e0f0f15d64050934865e4699695e9ae81d75b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 a5bc096aa87f485050bea44bb9520a77f91dfea9..fef98b929522dde7b5e2c5c68400b8083335af2a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 e2cece0e7d47cb3705214a0c52104cbe09b4da81..d5c861f057a8c01c63daf15b7099ee816682db8c 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -106,10 +106,10 @@ 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
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 7bc4705fcd898f6b736b4f10d5be59ff058df0d7..06be2a81a9cfc931a68fea9bdfa51631dd4ef338 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 07ca0e16605c9b1e529ce352f80629683bd23477..75a00d9425b37cdf16b241a7c8dd8f25f9ed9fd9 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 4cc47c3da47f0676bcbf3603b9e984e0f42c5d92..e7e0ab1050d227680da487248d40ca59c7e712d8 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 b1c22de9a4f351e06f395dc99d7a031dd814ffe0..064849bc29e34869905e3a022a52b7d57422d05b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 87ca15cf41a2b2731ad05a7769ef3cede3215614..ef1eeeeca660be9632292250ce3e20ac56859b55 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: AL15SEB060NY
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 ae3dc096242e1acc9597f1b57b3635b05f13fc3f..947b1e4271168bf503063c7fa9a6325fc8b5208c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 567c2a710f1e46cfd6faf52042d0b9fc0f78bb46..6fb9628a0a8ec72752c2e18b22867413f01fa458 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 e16f3cc56bb2c5ea5ebc553d8eab80fa46ae38a2..25507b07d0c92eade0a4d2db192e919abfcaabcf 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 efc711acfa0832f4a5fbf1ccfffa1547dc7effd6..1ab9113d8c10f7132cea10f66f3fae9848ef5dfb 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 10b41426740dc69f6039a0c19c2d8fd509c20d14..d429d3922c6a5851340e2ae35b20169abd848725 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 58bd2894afd60d5109c0e991fe23c04354d0e5e6..5c0fa0a72b7f8877be26d8e9f8c4bd2251913085 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 a5b375682ba8dad7629bf2eba754172ff1ea5092..993b8b9d7ea1dc51319175cda7d633ce110ab4a1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 dfba28fec2a902ee5d282758ed0180e04e875480..271ed3c60d1d1070d2b48a6a28c43721b7d30317 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 3c58b1cacd0c1c6f030d8c686e9b230b6d582634..5444f7b4b80e5a64eda625f9fed80c2313eb5727 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 2df9164ec175d943489d68c9dfd03ba3f57693dd..73caa721c91a6f39b8ee1f88fdc140a43be54f81 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 96ce751648749af79d9b978b0ab8a15a796b5b89..f60ff4104e9f8c8b096d74864ac08e5e79cbddce 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 63d0ad8d534d4dc22a127fa9cb372fac2caf508e..2e9a728be4c61ae093ac9146020c6578e80e1f4e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 a67c4aba3fe137843905fbc4af4e8c911cc541e9..b326b40f93f2d98f7d8e58a82228c221fc04b796 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MP0005
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 a859a9e6ba6f6df4bd05367cdef13ff1f6acf826..9e8e62e5a075466dc45d7f3a24bdd6c756742527 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 2ffae121421c7abb302eeadb34acc31189e427ba..215ba6e7b0c6272075422f3e8f33e0130b7a7ae5 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 9dafdd14f746a21211f4eefbaaef21be8dc59e16..7d04f425492f01333115091efb47e8a97861bfb4 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 e73513821c03bc5b38301f636b460cf6479ec602..723aa92ea3cf50573b21899e154d6d39afdfdf43 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 068dca4258ee1f7ac56f61ce705e5376b6203e9f..11f7ccd0c485f37e89051b9cc508b54d0acf3e0f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 20b80d5c66ab9a1f4e96ea58b135c95d0b1d72f6..a38deef8fda24a28702aa973022ac65d40a00c8d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 70a39dfebc623b1e48cf52f04f759eef15db1ffa..9ee88c9143d09662cdfa5ececf59ffd374bfc985 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX04SHB020
       size: 200049647616
       storage: SSD
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 6bcc2af1b13c01fb1d656449a17cf308a55b920f..5b1e48acee9b66b63c44b27edf56d27ebf34463d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 0dfe8172843d0cf7f8a33ae1e20af4007ce19ffb..fbd6f4421f22d9d4ad4b0edb0db075f3e4417810 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 4b7ae33479284f0f242f5f7d505e8213af7b292c..4a77c96f761a9b96de020e920f1a8aac7d573c7a 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -83,50 +83,50 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       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
+      id: disk2
       model: ST600MM0006
       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
+      id: disk3
       model: ST600MM0006
       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
+      id: disk4
       model: ST600MM0006
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 883d2089b25d0ea6cea817e2e314b1169e0816e4..c0ae2ce6acb763ab5a7636bd199ce9845354d346 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 ad6762b9cba1d0cf5f34d7b53c28216511d2a38c..2d762e75e7b317cc541445e30b74a36f856740a2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 1ad97ca6c87e0947520f2e4535f22d705fc2e812..4fed65c26a44c524925b19448779b3f93235ac34 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 fe26b9aae6a6f04f4cc021c01aabe29225d10989..5fe62ea55ae41e039378ab4f8f9cde58c4def707 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 d672a41e4f0032ed642ed4ca35169b9353138c57..beeee9f36d1a1ef3d9136cf2a5d29f4bd34b1336 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f62879c4806137b24f3e22df3150f63439645687..93c20c648002e9d0be733da14c63534d8a6e59e8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 2863d9a3532214f42835c7fe2cb71a3df88ffab0..901b4b9e9aa74fc59f950a1dbb7b50fb04fe4add 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 944cca2f7c30a37bb492aa59ca229340ef5eacd1..6dd648076bfe16b01b05c22250b349c682e06e10 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 fda739d05914331338ae336d978820004f033036..855add5a128201a32167ab4a4de5962b451eb5b0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 8cae431f33db801531853c09530d34434ba8713a..fbd6f6b046247817c4b39b47697b6a26cab5140f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 9ebaac8f1e636aa6768c7a38e01e220576e0ea84..fa1a97d8b97277d79d37662c9811df98b428ea5c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e032fd5f48efae04de5e3d5392ad26d8c24f504a..641238d68f6071bb00e7aac15d786b49f59ef76d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 7655a57c1e52fa73e899cebbf858c8eac811b4ff..b7a38289a35bade0e6cc008b7752a0366e37a3b6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 ceaa717a488f7ebe1dc5b136919c08ae68307efd..9e7735741557453de63ed51409b866a5e1922cc0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e1a8a8b2c87bff13acd72915e62b52e2676648aa..119143045e40311c9333ebda1c7b6317f7bba6de 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 fbf3ac6ad6af5bba4685410ee29a87f3f033be0d..00cf18e59a2e59b9997694a4d2201c52a2e2ce72 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e748f2dbe0afd5b00a89faf4efe1b7c2c8ed10af..ff2e38edb0ce82219cb22bfcb7c160b874827e1a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 7a41337168f790076b259d18bd9e3f5618d621a2..8a3d32870e156d61720da24843a55e3e7d81e81c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 68e18fe6e40021d4ef7a776dd18a344b6deb8f5a..bfd68e48b7d2a2e090cbd70d25396b5b228c3c12 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 046441d153e4587529cd2eb7f98afe190ae80d48..c839cf5fa5d09ed9c107b2add481f56b98190b9c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0b59319af67ebd148390b956d366e6915a27896a..6117ea80744ba3f6b8d41b78385eea6b2f172991 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 41b1716b5f3529891f6e2061d6672f5dbf6ea331..c338879c0817105c5f68866300f925fcd6d6993d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f6944cbfe9c676b0c247106954a59605683b4603..0b5a369ed127323974ec6e699f4cb271f5dc9268 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0f410d5f7bc429061c9a9248a2bca46d66d1f751..327e6ae1c1d55e6d9b32de1bed0781a7ec56083b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 be4e53c3c2d3ba8c2dd46fcfa727b4e643033a01..585f6ba7f324130f3da3d8522656542623f0794b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 1055b0ba5fbcff33dc7fab27a484ab6ad868e47d..d7767e6b3cf3a0b6d2607d2f5d04d1b8c4eb187c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 bf652bc41bed1e2dd9cd5dc24182be7865b133cf..5734f66628ca6d9d399b40895223bde769b5997a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f5eef1c5cbb98925619358dc93b9055c8c1c747a..6e98b454df2208ba984edc90bc483ecda749a672 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 8a3c4c6b3e5dd667e1d0420263ff0610a92f31cc..6e9aad3589f0610e110ea49fa1b80d8833cf4aa7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 09e7eee30607b09e2f97a0c7871bdb223d41041c..e35c1a56a889cca064c18fb6d0ea7854266d38a9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 7ec853951ba1c08bb46c9ea90e728c57df962f3f..786a9860291e132aac10e737443682073d483642 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 03f58939baadd79960443ae2ac0c64b734450232..aadc32d04bf053ea57e25a3d78705def2fdab34e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 b88c4fc6b69d8c0c53fde4b4a8a1d7b867b901e9..36aaca2e2f89ae0dd8149504220801d998819edc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 cd9146ad21394ecd0c26fb9c3a77f0d33670722e..26c074feecace798ec96514f966b366bb35955b3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f28a3b1dc7ce4f2f08fde5f5210063660d1571c8..83bb71ea74348f712a90f01d5ceef86cd38d8362 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 bf5e0f4b4c55101c734dc37152a616cc965b15b3..dc40eb7fe798b052d803f052c47f7a9a7d53b0d4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 2d715bf6b1fffd9c432fbfbcc0b8695fd45271ee..8fd0e1719bbabd36c2eebd6dd496d3ba68df1e9a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 afa6da9879b30d5cecf9ea67e0a622cb630c5e7f..f2557c8c09ff600a237364c32596fc194a869521 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 66a9849202a701f3ff5be095c4986b90fab7b340..c5fdc36bfa9b485082d5f18a7147a8f79e4b310d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0ffbd670d046fce6d82019d4a29092b3e3db3bcc..97c651ba2c3147c520f2f590407ae521a1e73a28 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 b2ac3f11ca25af617c09817df736abc16ff79a26..a400439c86baba44480cb19da983bca32ec00165 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0cd25ef66edb650e5d17d9551165974bc26f034d..1741d4c2491ff2fa752e222b1a0d623ce22ac2ea 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 949eeec65b545ef2580cdb168f19d0b404e7a796..51f195d4540feb1c8c6c42979a89074f86339cfd 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 b60fd111d2294be0c005b94759d5bcc46c28764e..457b31bba484997d660786960fc228dd0c868b7c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 38d758f14f717e32b79b12d856af843e1a4a1c56..9b32104958f551845a229c31926eb45e1bbb74e9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 c19978c8900dcd50af0d7812e2d7c3725761d930..f7e11ca2fd89e03933d205ca0b8b13ca2429a3eb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 dec06f6535b16d885c4e13d585aaae6de8f34249..cfcc67322839ec21c5bb87c28e37940f074df76a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f3006a57927188b3f85f80923fb98f9e8b53738a..8c059cab370d25c60dc23ec62dd432cc041bc11f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 7137ba8e6a33041015c4b51ec3c7b9e25a561913..c522626a6ac880c9beea349bef32b664beaff956 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 6e7787803be2ae8338190c963692750055b81d87..52dcac5f5aec4d42bab756b3ae32970ae46d8abd 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 ddd8f04f73bba89030cf681be78d747a11eb99eb..8b70b66779c4361ecd45931c90f6fd8e8b259115 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0ae956c25a328cb5c8df0551fd05f21e93818817..89a97f984ecf91c19b898712cdff3d5f6cfad961 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f7a64c1cfbba3e23e7bfcf42eebf90aeb2eec9bb..07a3870c1bd31a9776fe278ef19574a8d400b8d4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 3eec89472575b1c9e6750a33bf5c7370e98d5bb3..71a99b6acf76537716c12a55b12b2b6110600e76 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 ac62450b787c91f427655d4e0e9cc39f0912bfa7..d2f8fd03278ab77bba4566373f4db92196cb7a26 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 bdfc5ccdf56bc9f72fe225b6ecfc279c0b57af93..89bf83523397afc82e51066dfc941d9bd979c625 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 20a29c0044d22c662e3aa252690f41e36c6bb037..cb505433d9597ec6b0cc31cb9a63846306bb3534 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 9eac1e6688d89335b4823edc613dbef65c9b1078..e58a9372ae5abec79b7e32f07be2f26ea20eb384 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 c3205c7f8142703dfb6c29dad2f9cdc642618424..cbce2364e7b5ba29d741739b1745716608938a7f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 9e0707f7dd6e0000662615dd329441076d8246f8..042b06419ad8eb90f63e5d30de8552fb934c63f6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 81a06e6142f1c66256fad8ab548fc59d58f25c08..8cc104e5691b6bc20b563a8e21b1b945b4bceef3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e38b5868173f39743cb2287dd736d6aa22a9c770..413d8641cd32856141a6e56db4a21de4df1ca865 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 efe4e2855863071d4254afd461fba07f1d3d6d57..5d7123f39216ed8391bb31e80ff0d05305ae827d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f211422ad7124d753059d1dfa7c0931ad2cf69c6..a4ffa078827727ecfbf4e8dc16cda2c4489242a1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 a9cce1911013cb2651169f5832cdb69cb26e1fa1..a0b05c24f3364c0c6de072ae0e54b86f152fd308 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0bf6fce99153179647767bc00970affd9a1876d3..3b4bb46a7e2b837fc38cf7d3af77457f0d68ffc4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 b67be5354091faf84ad892abb38ce6b3b4055ed1..740b58ff6f571724836d78e4267f76f4f1ef96d8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 5f224fa2ff8ec828d1082c518b3d029f6c289ba2..b2417a2761e26622255a83f3c27c60c706255094 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 bf7c50df7619e0f071a5ac9df3e9a9cc3a71f729..73a89840df5329363e4f29f26bb53519c7887364 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0f41961e4953d11047afe568fd9a3a924e7fc1f7..8f439146f08857234d2096a316be819188928b9a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e3753c67be93a108147b4b21b92de22f8da7ff54..1a47202f5a39d8417cab9f5323bcee7d5e45065e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 fe8b6b588befd98c09dccecd91b70e6f4ccba3a6..cbdafe0b30311ef2b70a6ad8fafa59a65e4634ff 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -83,18 +83,18 @@ 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
+      id: disk0
       model: ST600MM0006
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 588137b7dfa8bb797603be2df3e95bdb2730ffa8..d8e4c36c4d86f942dd73c26ccfa46d831649be29 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 c486d08a6c95e34cae4dd06cf63078b404350bbb..607661ff4d7f58a47ddd2f69384c0444cdc99c1c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 9ca1f6f2bb8e210aa1e0f05d6cc9ed1f9729df92..a541409dd3705cfa618d93fd78f621e73f2862d4 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 aecb4f7ab69c0b95de79a4c4413cc0ea0d8735c6..2a3bd3af1a78b6ce0efb0ac567b759952c8ad754 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 a5598703bf1e222d8db37514836566c0f7653f9a..0423a5e7775d38e473723f0cdb6fbcf98a0877b7 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 4d1f9c3fd3ee5d3d0d8b48cb31de3e044276c922..16ec815e77fc1adcf616c50a9c47e58df88ab656 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 e97ee0e2123cbc1fe65f672e5ac488800e829a17..4b05a19934492aaceb08488bd18f1185bcb5a451 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 cf52fd7954b2e97be3f09a8202694b80d44bf291..b61d3e27425f1973a81d4cef3fb567e6282c55df 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 0fdc03e3271b2914d29fea83c4b333db8085b24c..5b9942aa1482d7315615a2fc2963fa2af7336c76 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 9090aa8a44b8a01e35182f03bc2284d417fdce6f..ab58054748ee647c50330caf9320fa0d0724cd3e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 bf0f78b4956dcb3300bd14a926701476da741411..14a11e4cd84507969751eae7a9a66238e981d424 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 ba9205b2ff60fa2ab07f4c4a80a912bb81fc5bb1..36856357dc8f326481a0d365163ea76feb2d4862 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 6405b469ab98a0ff0373ee49cd54ee39e81836b7..4fa3403f146b18261fa5658e98082907b68fd17d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 98b5945046ced73b4d55626a5c6027597e337ec5..8750f6da7c08dbe619ef033f1c895d9d658bd49c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 e7a3fb9aaad37bf1a60eeeea914203ba6f193e8f..04f4338ee5b33d70b2fa24845297ed5e709ffd0a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 c7a47b1a8301b14700f302bc3846105262dfdae6..277a55084bb0b5b47a79539ea16373755edcf458 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 72c0a5fd12d6eb12dc587562de25895c7ea9746c..4768fdacf2ba2d1b0c4cfaf9529990d658fd7f17 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 79613bd45e3cbc713f030d769ef223d891a38062..272b09edc3d15181837807aab0b3e4bdd3d85a96 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 2213e9570b13e493c747116cadf31edb12af6d3d..5f030cc86f5de2a5aac8fd247562b27c56287b28 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 1a71931b581751444078144edb6f700b7f2beb72..6c728154b627afa8df9267702f0c743bc91c09d3 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 ea747db89498d1761d12fd3c239fc980c683ffd1..a697291fc3629d16d074d508509b1261f1ef0c82 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 bbe8f908a5722ef6709f9830e59a6b76cca366cc..5331fd35a90d25af12b7693b7612f335d33de373 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 b517df3f3d4f041fdfdf9cabd939284c1250a20c..387483c0f3d289034cbbfcb3da00281e085b904e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 86b26cd749e35eb0f790418b203143310e717965..1fda15d354e7b5a46a9636356770c201fcf98a73 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 9b232a5b0f39e6e020bf43a20ead39532a308d4f..4f61a7889fa82b034f2567a2dc626cc76e02a603 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 54a4c222552c49321b8d021c24e7ea98448ee50e..d9c873ddca8c37b115776fe0d93aaa6c1ba466a6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 6147d50ccdfae93b8739caa8785a261eae2f8449..ee879ed5bfd99aa49a3fac47222b171efb75c4fa 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 34e2a94052248267bca8033c32efa3370779e01e..5987b72716ee8eee822c32e207f42ad0f104530c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 e09d6de1c745b96bda8a85a3207b1acb909e37b6..c181ed8ef58a79a6c1d8101391bd64656ae4113f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 78c78068ac8b9ff0f9b126040e96b7ca3c33cdf7..d7bd8339b5db66fbd4d2fe40483872bac272f79c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 5be0fee2be0da49e5cd094c2c5a878624c02a567..3656486378ea2684fdc1aad9e65fc6c23d5a5a9c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
@@ -87,10 +87,10 @@ 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
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD