diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
index 14ef50c7832456ebadc6c6c2af2c7ed6fe763c4f..38663cf2708f5a3b452203c0cec64e5c1fc7d2b0 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:9e:13",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.1",
       "ip6": "fe80::209:3dff:fe12:9e14",
       "kavlan": true,
       "mac": "00:09:3d:12:9e:14",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-1.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
index 90f178eb41c2b0910d808b5961a91c30d6077c8f..ca6d8fca4d9dbf329b60c9c02cb3e0ba7dc57527 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:9e:06",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.11",
       "ip6": "fe80::209:3dff:fe12:9e07",
       "kavlan": true,
       "mac": "00:09:3d:12:9e:07",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-11.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 8,
       "interface": "SCSI",
       "model": "ST373307LC",
-      "rev": 8,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
index 70f5793422ded52385bc7a6e793a4ca88f078343..8ac81ddd86e5e4d4d2dada10cedbc35260570281 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:3c:2b",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.12",
       "ip6": "fe80::209:3dff:fe12:3c2c",
       "kavlan": true,
       "mac": "00:09:3d:12:3c:2c",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-12.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 8,
       "interface": "SCSI",
       "model": "ST373307LC",
-      "rev": 8,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
index 25c577f4e301e986e98c6b48e2f1356dcc74fc6b..42f957ac3703ad39c495c6d8b1f808921de5ae4a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:91:60",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.13",
       "ip6": "fe80::209:3dff:fe12:9161",
       "kavlan": true,
       "mac": "00:09:3d:12:91:61",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-13.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
index ea641c16500ec374d0b4d4adafa21107da72c6c3..f787bef67b855bd381358039097141cb4fbfbacd 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:7a:bc",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.14",
       "ip6": "fe80::209:3dff:fe12:7abd",
       "kavlan": true,
       "mac": "00:09:3d:12:7a:bd",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-14.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
index 8a273a00aed0a68a04092a0fe91b4967744fcbd9..0f5cacf1605a349917e7fc6e2472ff66537b47cf 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:28:70",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.15",
       "ip6": "fe80::209:3dff:fe12:2871",
       "kavlan": true,
       "mac": "00:09:3d:12:28:71",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-15.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
index 64f43232ab8c4cf609ae8b883713d6dacf807fd7..71f9a4b1499acc34a14793cd5b31c7105da0afb2 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:7d:06",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.16",
       "ip6": "fe80::209:3dff:fe12:7d07",
       "kavlan": true,
       "mac": "00:09:3d:12:7d:07",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-16.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
index 76dd8fdbee993c121659fe5c9f4e72b3a597a55e..879b6331ed604d528737115f31b7d787dd58e897 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:11:e7:62",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.17",
       "ip6": "fe80::209:3dff:fe11:e763",
       "kavlan": true,
       "mac": "00:09:3d:11:e7:63",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-17.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
index 89cc68378c787e9de960a8a7fe0f12fa3737b943..6b64fa72805560138f1fa6b3dd1559555f979b01 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:7e:f1",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.18",
       "ip6": "fe80::209:3dff:fe12:7ef2",
       "kavlan": true,
       "mac": "00:09:3d:12:7e:f2",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-18.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
index 75e4362b10069e4bec43615f0f7e76cc11564dfa..d8374fbf6673ce7c8cff504a419d0c18402d6927 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:90:56",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.19",
       "ip6": "fe80::209:3dff:fe12:9057",
       "kavlan": true,
       "mac": "00:09:3d:12:90:57",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-19.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
index 9c63ef84b93e203e7cd8df11c57250c170da9ec2..0b38419c2a2cb6fb7e629f0560f0d8ada42b3d4e 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:65:7c",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.2",
       "ip6": "fe80::209:3dff:fe12:657d",
       "kavlan": true,
       "mac": "00:09:3d:12:65:7d",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-2.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
index be47ec34dc1d9d5a8b81625841f75288650474c0..236bc2d133e200bdff112ec9ef9394000d4ff03a 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:90:83",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.20",
       "ip6": "fe80::209:3dff:fe12:9084",
       "kavlan": true,
       "mac": "00:09:3d:12:90:84",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-20.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
index f787222d5d0944af2aa65a8e755d2eea086a1d8c..26b632916e877f0bcfb5aaba3874407143f90d3f 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:50:85",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.24",
       "ip6": "fe80::209:3dff:fe12:5086",
       "kavlan": true,
       "mac": "00:09:3d:12:50:86",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-24.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
index 18607e14c1d07f86accbc4771860751be7ac8584..8e2c7327aec62f9c21a547db45a2734cc8803ca1 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:6a:f0",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.27",
       "ip6": "fe80::209:3dff:fe12:6af1",
       "kavlan": true,
       "mac": "00:09:3d:12:6a:f1",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-27.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
index 65c4fa8a41fa8f5c0ac035bdb9374fdce05df08d..1426cfb648f18ab09c991843430e4d2c29db3608 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:11:e9:fe",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.29",
       "ip6": "fe80::209:3dff:fe11:e9ff",
       "kavlan": true,
       "mac": "00:09:3d:11:e9:ff",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-29.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
index 71c6199879f91e9e4e241214e1bf184ad4de1dd9..c1bad283ebbdc7f6be719e6856de56850ea6b8cf 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:91:66",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.3",
       "ip6": "fe80::209:3dff:fe12:9167",
       "kavlan": true,
       "mac": "00:09:3d:12:91:67",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-3.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
index 58b2afdf570396041959a95dabffebabada68beb..793eda0a766e093dfb0bdaee6bc6c7e6845da0f3 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:7c:93",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.30",
       "ip6": "fe80::209:3dff:fe12:7c94",
       "kavlan": true,
       "mac": "00:09:3d:12:7c:94",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-30.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
index e76ce75aee51adf171ff3e0d3b28702f02262e05..a7607142d08a6a7da7a243dde076c543a34b70f9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:c9:0c",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.31",
       "ip6": "fe80::209:3dff:fe12:c90e",
       "kavlan": true,
       "mac": "00:09:3d:12:c9:0e",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-31.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
index ffaf1151e4fc4f2f7879fa196c0153611a96f2f8..1a6f113ba48970aba407c7c9e35541558ef47740 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:a5:74",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.32",
       "ip6": "fe80::209:3dff:fe12:a575",
       "kavlan": true,
       "mac": "00:09:3d:12:a5:75",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-32.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
index 8e2dfc0b40e6328718fc12dd149790be3ce5fe78..ebeb19cee685f509edcb15eecb80ff0e55b3e2a9 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:92:70",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.33",
       "ip6": "fe80::209:3dff:fe12:9271",
       "kavlan": true,
       "mac": "00:09:3d:12:92:71",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-33.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
index 7fef2c832a6041518e9544f1acfd79482b7e4935..c63a74a1699a5502a690fa2be0f0adea1db65702 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:a4:ee",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.34",
       "ip6": "fe80::209:3dff:fe12:a4ef",
       "kavlan": true,
       "mac": "00:09:3d:12:a4:ef",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-34.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
index 3a937b99588658d130b747bc706ab05dc6c07007..1d84eaca7ac0fa61f6fa66fab8a39872bdef62d7 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:7e:bb",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.4",
       "ip6": "fe80::209:3dff:fe11:9522",
       "kavlan": true,
       "mac": "00:09:3d:12:7e:bc",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-4.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
index 9e7e491e8c239d6376e4eb5a25e0be323c3050b9..1e5446f22e5a85af9c1a51f29eaeaa946928e236 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:28:4f",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.43",
       "ip6": "fe80::209:3dff:fe11:9522",
       "kavlan": true,
       "mac": "00:09:3d:12:28:50",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-43.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
index 476e56b031de043f99171d6a1ecfc18c510607e6..e5313d02012e126044f05c3c5ac02fe2397ab2f0 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:a4:b4",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.44",
       "ip6": "fe80::209:3dff:fe12:a4b5",
       "kavlan": true,
       "mac": "00:09:3d:12:a4:b5",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-44.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
index ef471cc1acc8c8ef1c10296707a6ae4deb8430cb..c262d9912322ee02a16e2fefc3d878b90782696b 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:9d:e5",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.46",
       "ip6": "fe80::209:3dff:fe12:9de6",
       "kavlan": true,
       "mac": "00:09:3d:12:9d:e6",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-46.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
index 43f7f8645a9bfbe1746f4aedb368a94407e6eafe..6244c784d65077f538bf3680edadc60d5221ae12 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:3c:03",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.47",
       "ip6": "fe80::209:3dff:fe12:3c04",
       "kavlan": true,
       "mac": "00:09:3d:12:3c:04",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-47.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
index 5155b56fe6b63633ada541bf6c64e97ec96dcaf5..0b6c17042fb4844c1c62539c05d4059a5101e570 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:92:f5",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.48",
       "ip6": "fe80::209:3dff:fe12:92f6",
       "kavlan": true,
       "mac": "00:09:3d:12:92:f6",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-48.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
index dc9bab038b7eed3180156ba7c34d9527567cac04..a5b07d3c1201f2e5849c5076b8eba993e717911b 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:3b:dd",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.49",
       "ip6": "fe80::209:3dff:fe12:3bde",
       "kavlan": true,
       "mac": "00:09:3d:12:3b:de",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-49.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
index f3f87bdead79c092b35cb06a695e0d4e0c76f2f0..6f530294ede018395945ca410d2dba9039edb787 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:3b:79",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.5",
       "ip6": "fe80::209:3dff:fe12:3b7a",
       "kavlan": true,
       "mac": "00:09:3d:12:3b:7a",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-5.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
index 9b4d1590ad1033e69343d149d014445512f25532..2fcc29223dcb654016e31c69c9bfcc4d387ae209 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:69:b7",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.50",
       "ip6": "fe80::209:3dff:fe12:69b8",
       "kavlan": true,
       "mac": "00:09:3d:12:69:b8",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-50.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
index 4d78d7a6ac575ac92e58530e8dc96775a624b2d1..5f4f5e2c31c6dcc4764ebe5c415088a0aff6d305 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:3c:70",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.51",
       "ip6": "fe80::209:3dff:fe12:3c71",
       "kavlan": true,
       "mac": "00:09:3d:12:3c:71",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-51.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
index bc4638ef3421bf5bab3a15b50783ac642d2a8f55..163a640f67851b2bdc9c82d645ebcc1b74629f97 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:3e:ea",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.6",
       "ip6": "fe80::209:3dff:fe12:3eeb",
       "kavlan": true,
       "mac": "00:09:3d:12:3e:eb",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-6.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 2,
       "interface": "SCSI",
       "model": "ST373207LC",
-      "rev": 2,
       "size": 73407868928,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
index 34d71d9afd42439425559a8f9540fac7f87e7a62..a08ee96b42fd0915b0a16863f1c4f0d792824ea6 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
@@ -54,14 +54,16 @@
       "device": "eth0",
       "driver": "tg3",
       "enabled": false,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:09:3d:12:7f:e9",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
+      "name": "enp2s2f0",
+      "rate": 0,
       "vendor": "Broadcom"
     },
     {
@@ -69,15 +71,17 @@
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
+      "firmware_version": "5704-v3.27",
       "interface": "Ethernet",
       "ip": "172.16.49.7",
       "ip6": "fe80::209:3dff:fe12:7fea",
       "kavlan": true,
       "mac": "00:09:3d:12:7f:ea",
       "management": false,
-      "model": "BCM5704",
+      "model": "NetXtreme BCM5704 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
+      "name": "enp2s2f1",
       "network_address": "sagittaire-7.lyon.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lyon",
@@ -152,13 +156,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
       "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
       "device": "sda",
       "driver": "mptspi",
+      "firmware_version": 104,
       "interface": "SCSI",
       "model": "MAT3073NC",
-      "rev": 104,
       "size": 73543163904,
       "storage": "HDD",
       "vendor": "FUJITSU"
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
index 556298aa69d840b04eb82487429d99a281d48840..575b794741fa46a3763bb56bf03df20fc4f492c8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-1:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-1:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:9e:13
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.1
       mac: 00:09:3d:12:9e:14
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-1:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   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 01458a9bcc2ca36db8ce4b384a7fa34f85c4442c..ffda840be45fd929c58e51a68bfa57296e45a8df 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-11:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-11:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:9e:06
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.11
       mac: 00:09:3d:12:9e:07
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-11:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 8
       model: ST373307LC
-      rev: 8
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 6c2296914095042b09d3efca6b3440a648fd3f16..fcd2148aaa00e35e4dfd1f0871025ad2ea372c0a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-12:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-12:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:3c:2b
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.12
       mac: 00:09:3d:12:3c:2c
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-12:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 8
       model: ST373307LC
-      rev: 8
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 1294b856e5b54475eb0dfb63d5afb92976cfa9f0..4edc22c153c2a86f12b295bab2aaed4ccccf3f98 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-13:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-13:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:91:60
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.13
       mac: 00:09:3d:12:91:61
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-13:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 d948ebfcd8c791b1ff63594ca11005a4fcb16f4d..b89fcd27f59928d94d51e3401b528f4e95e3d3d9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-14:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-14:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:7a:bc
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.14
       mac: 00:09:3d:12:7a:bd
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-14:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 c05e07ed543fa48c44c1d9e3792ac711a239ba0b..04fb24fb2cbffee25859eb975a330a4d91aa1bc4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-15:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-15:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:28:70
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.15
       mac: 00:09:3d:12:28:71
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-15:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 fc26eb89e3acfea0a72b8e656a3eac44356af14b..318aac101c608d2c55cab65f71ca5d285f6cdfb4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-16:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-16:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:7d:06
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.16
       mac: 00:09:3d:12:7d:07
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-16:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 39e432eeb13f48e0030f3e1fdaebfea830642757..fed6818a9bbd769513d229ab73a7ab7e7dc97c44 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-17:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-17:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:11:e7:62
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.17
       mac: 00:09:3d:11:e7:63
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-17:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 3c74a648c388fa7c80c5faf6de50ec63e4c9ce2e..627523ea23fccb4eea2b59b1e2f6af958dc69fa8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-18:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-18:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:7e:f1
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.18
       mac: 00:09:3d:12:7e:f2
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-18:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
index c4f3abcc7c22d90e4ca15bb6a73aa59908e673e6..1a7117c065ae92be61ab12185076d26e49738500 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-19:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-19:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:90:56
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.19
       mac: 00:09:3d:12:90:57
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-19:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 92efd8fa51c837624457c7b53cca5b4d9e31e6ac..c3c2f1631f1daf7be20bc2bfd147a2a929161a48 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-2:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-2:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:65:7c
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.2
       mac: 00:09:3d:12:65:7d
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-2:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 ac6e94f320aacec6ee59647b59b205d7734d66d0..4c4cfab9537efc216eff2cfec839bba2f434c5fc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-20:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-20:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:90:83
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.20
       mac: 00:09:3d:12:90:84
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-20:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
index e5d65eb4b11a848f5a317803ae3067f75e73e1d2..a08dcc0b54367c226f8889af30fa6bd7329da976 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-24:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-24:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:50:85
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.24
       mac: 00:09:3d:12:50:86
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-24:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
index a8368757db01a6a4822be515f33c937591ff317b..385d942f52e65cbbf44e52e5d39a0159f643e762 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-27:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-27:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:6a:f0
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.27
       mac: 00:09:3d:12:6a:f1
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-27:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
index 28fadbc2c836960e7dae16a80c51a783928140a5..e49ac904a45f718a8fdaf6b53bdfe3746b0d7b36 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-29:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-29:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:11:e9:fe
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.29
       mac: 00:09:3d:11:e9:ff
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-29:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   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 beb1f2df088d120c234add1293963526e7889c91..565fca0d16ecd9a320beb98b412d568b741a7905 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-3:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-3:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:91:66
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.3
       mac: 00:09:3d:12:91:67
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-3:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
index 2e1311be14df91963d9fbda220a2cfa4ebb26294..42c837eec410443e2c8358e9a1f923936f04fce0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-30:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-30:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:7c:93
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.30
       mac: 00:09:3d:12:7c:94
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-30:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
index 80b1335108ce64a4b13f6f535cc9433bdd9bbb25..5816d75d88b1c5975d113e00e3168d9d7005ef47 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-31:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-31:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:c9:0c
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.31
       mac: 00:09:3d:12:c9:0e
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-31:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 5004d609c75d4020f7baeeae17ec1897f2a461c4..c160a1bde4a74d91592355cdaeca47f3507825ac 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-32:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-32:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:a5:74
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.32
       mac: 00:09:3d:12:a5:75
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-32:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 3955fbb334635402693848d3d00734df2580c412..a36f6ce0e8b2d132b35175fdb69358706e3d8c20 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-33:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-33:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:92:70
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.33
       mac: 00:09:3d:12:92:71
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-33:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 f4acc875ed870bfc2edf6de9e1bb4283935e381d..c9c3ae7021756c65e61f4ef83a7b78b5176e48cf 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-34:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-34:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:a4:ee
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.34
       mac: 00:09:3d:12:a4:ef
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-34:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   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 de4071572e7b83a6ad6d5428857b8eb21a5ac0bc..fbfe76333b889df7b9398e5420bedc4aafa102b0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-4:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-4:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:7e:bb
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.4
       mac: 00:09:3d:12:7e:bc
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-4:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   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 f2c5edfad4f91575ff32e8dc385e76ad393bf1a1..8c0a5c728005bcc4d458bc3c4d9b8e9870ee3f0d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-43:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-43:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:28:4f
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.43
       mac: 00:09:3d:12:28:50
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-43:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 e6c97271c503f614a0f01179c3d3e827c339361c..dfb13457bb7bbcad4253c09e635aed558bac4ca2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-44:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-44:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:a4:b4
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.44
       mac: 00:09:3d:12:a4:b5
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-44:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
index f6a556f6926ddf30d80444540a009690b76621e9..893759f37f6c6a8b334f90b3c99c3a2fbe7f0803 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-46:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-46:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:9d:e5
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.46
       mac: 00:09:3d:12:9d:e6
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-46:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 9a3387bb3c2c2785b5263b27805dfa3b838810af..85e574cf05f785a21834b5137c06184fcbb0104f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-47:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-47:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:3c:03
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.47
       mac: 00:09:3d:12:3c:04
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-47:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 631f5c5a5665c3421345aa6927a0ee8f4382818d..3b6eb23ffe01beabc280d959b265f50cc021843b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-48:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-48:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:92:f5
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.48
       mac: 00:09:3d:12:92:f6
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-48:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 f60849f668865efd25d504c185e8c8818226f709..866cb510c9dc8adc94f44f85afd7d7fda090b987 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-49:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-49:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:3b:dd
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.49
       mac: 00:09:3d:12:3b:de
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-49:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 aa34a0a1451c39dd64cb049387e2f33ff6d638b7..b2a5478825db905aa97b233c7e79cd7dc070724e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-5:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-5:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:3b:79
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.5
       mac: 00:09:3d:12:3b:7a
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-5:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 90f659407332f8efd6ed0a970ca7e0bc9d4d1b0d..1a5355f760c2589ccaf2d42bf2476f7484712fcc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-50:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-50:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:69:b7
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.50
       mac: 00:09:3d:12:69:b8
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-50:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
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 c8decb8ea1c35fb363aba7421e4a1b5d53ca3cdf..0fcd12cc80c5d7f98b1ffdc38d9986ade9afb58f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-51:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-51:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:3c:70
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.51
       mac: 00:09:3d:12:3c:71
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-51:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   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 8626f3f31f34ff0e2decb62c4aaefedecd11545a..fdbd1a8521e6411f1b6ce80460a4a38149390a9a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-6:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-6:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:3e:ea
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.6
       mac: 00:09:3d:12:3e:eb
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-6:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 2
       model: ST373207LC
-      rev: 2
       size: 73407868928
       vendor: SEAGATE
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
index 696a0fc5806d567ca7cc656c2c7e9b333b501f22..4443487195266f410777a9675da9748867deb165 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
@@ -1,3 +1,4 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-7:
   architecture:
@@ -22,16 +23,25 @@ sagittaire-7:
       management: true
     eth0:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       mac: 00:09:3d:12:7f:e9
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f0
+      rate: 0
+      vendor: Broadcom
     eth1:
       driver: tg3
+      firmware_version: 5704-v3.27
       interface: Ethernet
       ip: 172.16.49.7
       mac: 00:09:3d:12:7f:ea
       management: false
+      model: NetXtreme BCM5704 Gigabit Ethernet
+      name: enp2s2f1
       rate: 1000000000
+      vendor: Broadcom
   operating_system:
     cstate_driver: none
     cstate_governor: menu
@@ -58,10 +68,9 @@ sagittaire-7:
   storage_devices:
     sda:
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
+      firmware_version: 104
       model: MAT3073NC
-      rev: 104
       size: 73543163904
       vendor: FUJITSU
-      by_id: node-was-not-available-to-retrieve-this-value
   supported_job_types:
     virtual: false