From f1a072844c9aa582fdd6e98db3a87c86c20d3bd0 Mon Sep 17 00:00:00 2001
From: Nicolas Michon <nicolas.michon@inria.fr>
Date: Thu, 31 Aug 2017 11:24:30 +0200
Subject: [PATCH] [lyon] sagittaire updates from new g5k-checks version

---
 .../clusters/sagittaire/nodes/sagittaire-1.json     | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-11.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-12.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-13.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-14.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-15.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-16.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-17.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-18.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-19.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-2.json     | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-20.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-24.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-27.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-29.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-3.json     | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-30.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-31.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-32.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-33.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-34.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-4.json     | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-43.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-44.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-46.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-47.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-48.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-49.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-5.json     | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-50.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-51.json    | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-6.json     | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-7.json     | 13 ++++++++-----
 .../clusters/sagittaire/nodes/sagittaire-1.yaml     | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-11.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-12.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-13.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-14.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-15.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-16.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-17.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-18.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-19.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-2.yaml     | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-20.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-24.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-27.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-29.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-3.yaml     | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-30.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-31.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-32.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-33.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-34.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-4.yaml     | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-43.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-44.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-46.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-47.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-48.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-49.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-5.yaml     | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-50.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-51.yaml    | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-6.yaml     | 13 +++++++++++--
 .../clusters/sagittaire/nodes/sagittaire-7.yaml     | 13 +++++++++++--
 66 files changed, 627 insertions(+), 231 deletions(-)

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 14ef50c7832..38663cf2708 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 90f178eb41c..ca6d8fca4d9 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 70f5793422d..8ac81ddd86e 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 25c577f4e30..42f957ac370 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 ea641c16500..f787bef67b8 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 8a273a00aed..0f5cacf1605 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 64f43232ab8..71f9a4b1499 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 76dd8fdbee9..879b6331ed6 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 89cc68378c7..6b64fa72805 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 75e4362b100..d8374fbf667 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 9c63ef84b93..0b38419c2a2 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 be47ec34dc1..236bc2d133e 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 f787222d5d0..26b632916e8 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 18607e14c1d..8e2c7327aec 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 65c4fa8a41f..1426cfb648f 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 71c6199879f..c1bad283ebb 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 58b2afdf570..793eda0a766 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 e76ce75aee5..a7607142d08 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 ffaf1151e4f..1a6f113ba48 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 8e2dfc0b40e..ebeb19cee68 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 7fef2c832a6..c63a74a1699 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 3a937b99588..1d84eaca7ac 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 9e7e491e8c2..1e5446f22e5 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 476e56b031d..e5313d02012 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 ef471cc1acc..c262d991232 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 43f7f8645a9..6244c784d65 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 5155b56fe6b..0b6c17042fb 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 dc9bab038b7..a5b07d3c120 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 f3f87bdead7..6f530294ede 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 9b4d1590ad1..2fcc29223dc 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 4d78d7a6ac5..5f4f5e2c31c 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 bc4638ef342..163a640f678 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 34d71d9afd4..a08ee96b42f 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 556298aa69d..575b794741f 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 01458a9bcc2..ffda840be45 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 6c229691409..fcd2148aaa0 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 1294b856e5b..4edc22c153c 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 d948ebfcd8c..b89fcd27f59 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 c05e07ed543..04fb24fb2cb 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 fc26eb89e3a..318aac101c6 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 39e432eeb13..fed6818a9bb 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 3c74a648c38..627523ea23f 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 c4f3abcc7c2..1a7117c065a 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 92efd8fa51c..c3c2f1631f1 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 ac6e94f320a..4c4cfab9537 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 e5d65eb4b11..a08dcc0b543 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 a8368757db0..385d942f52e 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 28fadbc2c83..e49ac904a45 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 beb1f2df088..565fca0d16e 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 2e1311be14d..42c837eec41 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 80b1335108c..5816d75d88b 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 5004d609c75..c160a1bde4a 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 3955fbb3346..a36f6ce0e8b 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 f4acc875ed8..c9c3ae70217 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 de4071572e7..fbfe76333b8 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 f2c5edfad4f..8c0a5c72800 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 e6c97271c50..dfb13457bb7 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 f6a556f6926..893759f37f6 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 9a3387bb3c2..85e574cf05f 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 631f5c5a566..3b6eb23ffe0 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 f60849f6688..866cb510c9d 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 aa34a0a1451..b2a5478825d 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 90f65940733..1a5355f760c 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 c8decb8ea1c..0fcd12cc80c 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 8626f3f31f3..fdbd1a8521e 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 696a0fc5806..44434871952 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
-- 
GitLab