diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
index 6d759687e5cbbb57b8e04047568e27ce786b359f..93570a1ef9b0caa1baae2a8a0a294c187db966ce 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
@@ -59,6 +59,7 @@
       "device": "eth0",
       "driver": "ixgbe",
       "enabled": true,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "ip": "172.16.70.5",
       "kavlan": true,
@@ -67,17 +68,19 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp1s0f0",
       "network_address": "graoully-5.nancy.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-nancy",
       "switch_port": "Ethernet1/5",
-      "vendor": "Intel Corporation"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:1f:92",
@@ -85,14 +88,16 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp1s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:34:b4",
@@ -100,14 +105,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:34:b6",
@@ -115,14 +122,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth4",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:1f:94",
@@ -130,14 +139,16 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth5",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:1f:95",
@@ -145,8 +156,9 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -159,7 +171,7 @@
       "ib_switch_card_pos": null,
       "interface": "InfiniBand",
       "ip": "172.18.70.5",
-      "ip6": "fe80::e61d:2d03:bf:52c1",
+      "ip6": null,
       "kavlan": false,
       "mac": null,
       "management": false,
@@ -169,8 +181,7 @@
       "network_address": "graoully-5-ib0.nancy.grid5000.fr",
       "rate": 56000000000,
       "switch": "sgraoullyib",
-      "vendor": "Mellanox",
-      "version": "MT4099"
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -240,9 +251,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
@@ -252,9 +263,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
index 2d4c305c6f0bcde86a2550e53be0500ebc4f8695..13d9f57f5bffceb78eef9670d1c3f7a59d4f5b61 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
@@ -59,6 +59,7 @@
       "device": "eth0",
       "driver": "ixgbe",
       "enabled": true,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "ip": "172.16.70.6",
       "kavlan": true,
@@ -67,17 +68,19 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp1s0f0",
       "network_address": "graoully-6.nancy.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-nancy",
       "switch_port": "Ethernet1/6",
-      "vendor": "Intel Corporation"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:0c:22",
@@ -85,14 +88,16 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp1s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:34:9c",
@@ -100,14 +105,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:34:9e",
@@ -115,14 +122,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth4",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:0c:24",
@@ -130,14 +139,16 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth5",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:0c:25",
@@ -145,8 +156,9 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -159,7 +171,7 @@
       "ib_switch_card_pos": null,
       "interface": "InfiniBand",
       "ip": "172.18.70.6",
-      "ip6": "fe80::e61d:2d03:b9:2e01",
+      "ip6": null,
       "kavlan": false,
       "mac": null,
       "management": false,
@@ -169,8 +181,7 @@
       "network_address": "graoully-6-ib0.nancy.grid5000.fr",
       "rate": 56000000000,
       "switch": "sgraoullyib",
-      "vendor": "Mellanox",
-      "version": "MT4099"
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -240,9 +251,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
@@ -252,9 +263,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
index 6e43f27a9e6e9ebf6d2c45f2dadcc408aec54b27..4eacb137bec5d2287a520dee1a8562a1c3147aea 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
@@ -59,6 +59,7 @@
       "device": "eth0",
       "driver": "ixgbe",
       "enabled": true,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "ip": "172.16.70.7",
       "kavlan": true,
@@ -67,17 +68,19 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp1s0f0",
       "network_address": "graoully-7.nancy.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-nancy",
       "switch_port": "Ethernet1/7",
-      "vendor": "Intel Corporation"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:1e:0a",
@@ -85,14 +88,16 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp1s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:38:60",
@@ -100,14 +105,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:38:62",
@@ -115,14 +122,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth4",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:1e:0c",
@@ -130,14 +139,16 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth5",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:1e:0d",
@@ -145,8 +156,9 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -159,7 +171,7 @@
       "ib_switch_card_pos": null,
       "interface": "InfiniBand",
       "ip": "172.18.70.7",
-      "ip6": "fe80::e61d:2d03:b9:2cb1",
+      "ip6": null,
       "kavlan": false,
       "mac": null,
       "management": false,
@@ -169,8 +181,7 @@
       "network_address": "graoully-7-ib0.nancy.grid5000.fr",
       "rate": 56000000000,
       "switch": "sgraoullyib",
-      "vendor": "Mellanox",
-      "version": "MT4099"
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -240,9 +251,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
@@ -252,9 +263,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
index f156881ba46b51fef659176de027b733073cec9e..f5351c610478a515b7ed7b591f1ccaaee581ca48 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
@@ -59,6 +59,7 @@
       "device": "eth0",
       "driver": "ixgbe",
       "enabled": true,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "ip": "172.16.70.8",
       "kavlan": true,
@@ -67,17 +68,19 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp1s0f0",
       "network_address": "graoully-8.nancy.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-nancy",
       "switch_port": "Ethernet1/8",
-      "vendor": "Intel Corporation"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:12:72",
@@ -85,14 +88,16 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp1s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:37:98",
@@ -100,14 +105,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:37:9a",
@@ -115,14 +122,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth4",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:12:74",
@@ -130,14 +139,16 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth5",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:12:75",
@@ -145,8 +156,9 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -159,7 +171,7 @@
       "ib_switch_card_pos": null,
       "interface": "InfiniBand",
       "ip": "172.18.70.8",
-      "ip6": "fe80::e61d:2d03:b9:30b1",
+      "ip6": null,
       "kavlan": false,
       "mac": null,
       "management": false,
@@ -169,8 +181,7 @@
       "network_address": "graoully-8-ib0.nancy.grid5000.fr",
       "rate": 56000000000,
       "switch": "sgraoullyib",
-      "vendor": "Mellanox",
-      "version": "MT4099"
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -240,9 +251,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
@@ -252,9 +263,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
index bcc93a7a0cc398bf9466f32d8ce1e03a908ebcd3..b35cd595e03f941593975d19205de0054e5739ef 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
@@ -59,6 +59,7 @@
       "device": "eth0",
       "driver": "ixgbe",
       "enabled": true,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "ip": "172.16.70.9",
       "kavlan": true,
@@ -67,17 +68,19 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp1s0f0",
       "network_address": "graoully-9.nancy.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-nancy",
       "switch_port": "Ethernet1/9",
-      "vendor": "Intel Corporation"
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f4",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:1e:d2",
@@ -85,14 +88,16 @@
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp1s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:35:ac",
@@ -100,14 +105,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
+      "firmware_version": "0x800007f5",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "a0:36:9f:7f:35:ae",
@@ -115,14 +122,16 @@
       "model": "Ethernet 10G 2P X520 Adapter",
       "mountable": false,
       "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp129s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth4",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:1e:d4",
@@ -130,14 +139,16 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f0",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
       "device": "eth5",
       "driver": "igb",
       "enabled": false,
+      "firmware_version": "1.67, 0x80000d26, 16.5.20",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "24:6e:96:03:1e:d5",
@@ -145,8 +156,9 @@
       "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000,
-      "vendor": "Intel Corporation"
+      "name": "enp5s0f1",
+      "rate": 0,
+      "vendor": "Intel"
     },
     {
       "bridged": false,
@@ -159,7 +171,7 @@
       "ib_switch_card_pos": null,
       "interface": "InfiniBand",
       "ip": "172.18.70.9",
-      "ip6": "fe80::e61d:2d03:b9:3111",
+      "ip6": null,
       "kavlan": false,
       "mac": null,
       "management": false,
@@ -169,8 +181,7 @@
       "network_address": "graoully-9-ib0.nancy.grid5000.fr",
       "rate": 56000000000,
       "switch": "sgraoullyib",
-      "vendor": "Mellanox",
-      "version": "MT4099"
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -240,9 +251,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
@@ -252,9 +263,9 @@
       "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "driver": "megaraid_sas",
+      "firmware_version": "TT31",
       "interface": "SCSI",
       "model": "ST600MM0088",
-      "rev": "TT31",
       "size": 600127266816,
       "storage": "HDD",
       "vendor": "SEAGATE"
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
index 2e1d4bf21b347f8e3273fddf948fce3ddc6dd1dc..32263a5d8bbda441eda8f4d8fc4b24a4a6a007aa 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -28,45 +28,74 @@ graoully-5:
       management: true
     eth0:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       ip: 172.16.70.5
       mac: 24:6e:96:03:1f:90
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0
       rate: 10000000000
+      vendor: Intel
     eth1:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       mac: 24:6e:96:03:1f:92
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f1
+      rate: 0
+      vendor: Intel
     eth2:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:34:b4
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f0
+      rate: 0
+      vendor: Intel
     eth3:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:34:b6
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f1
+      rate: 0
+      vendor: Intel
     eth4:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:1f:94
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f0
+      rate: 0
+      vendor: Intel
     eth5:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:1f:95
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f1
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:c1
       interface: InfiniBand
       ip: 172.18.70.5
-      ip6: fe80::e61d:2d03:bf:52c1
       management: false
+      model: MT27500 Family [ConnectX-3]
       rate: 56000000000
-      version: MT4099
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -94,15 +123,15 @@ graoully-5:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fd3b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5141a3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
index b849e91444f305617449bf24bc5425ae89a6d2d6..20c24352084bbbfdf56ec02a8b12dac21c99021c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -28,45 +28,74 @@ graoully-6:
       management: true
     eth0:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       ip: 172.16.70.6
       mac: 24:6e:96:03:0c:20
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0
       rate: 10000000000
+      vendor: Intel
     eth1:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       mac: 24:6e:96:03:0c:22
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f1
+      rate: 0
+      vendor: Intel
     eth2:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:34:9c
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f0
+      rate: 0
+      vendor: Intel
     eth3:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:34:9e
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f1
+      rate: 0
+      vendor: Intel
     eth4:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:0c:24
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f0
+      rate: 0
+      vendor: Intel
     eth5:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:0c:25
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f1
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:2e:01
       interface: InfiniBand
       ip: 172.18.70.6
-      ip6: fe80::e61d:2d03:b9:2e01
       management: false
+      model: MT27500 Family [ConnectX-3]
       rate: 56000000000
-      version: MT4099
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -94,15 +123,15 @@ graoully-6:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51070b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50f367"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
index 7250e3c3f5a8bb95726c02e513fba09c6756543f..f3fc5de784e6c69c7096e2c294a4d6c86e16a539 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -28,45 +28,74 @@ graoully-7:
       management: true
     eth0:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       ip: 172.16.70.7
       mac: 24:6e:96:03:1e:08
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0
       rate: 10000000000
+      vendor: Intel
     eth1:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       mac: 24:6e:96:03:1e:0a
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f1
+      rate: 0
+      vendor: Intel
     eth2:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:38:60
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f0
+      rate: 0
+      vendor: Intel
     eth3:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:38:62
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f1
+      rate: 0
+      vendor: Intel
     eth4:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:1e:0c
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f0
+      rate: 0
+      vendor: Intel
     eth5:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:1e:0d
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f1
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:2c:b1
       interface: InfiniBand
       ip: 172.18.70.7
-      ip6: fe80::e61d:2d03:b9:2cb1
       management: false
+      model: MT27500 Family [ConnectX-3]
       rate: 56000000000
-      version: MT4099
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -94,15 +123,15 @@ graoully-7:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5115c3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51369b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
index 049fab3c03cced939ad01751ec9b98281c366bfe..2a2cbe579428062c4d78e6c199343c70717762f5 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -28,45 +28,74 @@ graoully-8:
       management: true
     eth0:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       ip: 172.16.70.8
       mac: 24:6e:96:03:12:70
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0
       rate: 10000000000
+      vendor: Intel
     eth1:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       mac: 24:6e:96:03:12:72
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f1
+      rate: 0
+      vendor: Intel
     eth2:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:37:98
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f0
+      rate: 0
+      vendor: Intel
     eth3:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:37:9a
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f1
+      rate: 0
+      vendor: Intel
     eth4:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:12:74
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f0
+      rate: 0
+      vendor: Intel
     eth5:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:12:75
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f1
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:30:b1
       interface: InfiniBand
       ip: 172.18.70.8
-      ip6: fe80::e61d:2d03:b9:30b1
       management: false
+      model: MT27500 Family [ConnectX-3]
       rate: 56000000000
-      version: MT4099
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -94,15 +123,15 @@ graoully-8:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9837"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fc813"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
index 0a854ec89108c6e298d5a11856d5bb6ef3f58003..67d74c32a3177756efc233d66eb5515ab6ce81e8 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -28,45 +28,74 @@ graoully-9:
       management: true
     eth0:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       ip: 172.16.70.9
       mac: 24:6e:96:03:1e:d0
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0
       rate: 10000000000
+      vendor: Intel
     eth1:
       driver: ixgbe
+      firmware_version: '0x800007f4'
       interface: Ethernet
       mac: 24:6e:96:03:1e:d2
       management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f1
+      rate: 0
+      vendor: Intel
     eth2:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:35:ac
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f0
+      rate: 0
+      vendor: Intel
     eth3:
       driver: ixgbe
+      firmware_version: '0x800007f5'
       interface: Ethernet
       mac: a0:36:9f:7f:35:ae
       management: false
+      model: Ethernet 10G 2P X520 Adapter
+      name: enp129s0f1
+      rate: 0
+      vendor: Intel
     eth4:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:1e:d4
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f0
+      rate: 0
+      vendor: Intel
     eth5:
       driver: igb
+      firmware_version: 1.67, 0x80000d26, 16.5.20
       interface: Ethernet
       mac: 24:6e:96:03:1e:d5
       management: false
+      model: I350 Gigabit Network Connection
+      name: enp5s0f1
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:31:11
       interface: InfiniBand
       ip: 172.18.70.9
-      ip6: fe80::e61d:2d03:b9:3111
       management: false
+      model: MT27500 Family [ConnectX-3]
       rate: 56000000000
-      version: MT4099
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -94,15 +123,15 @@ graoully-9:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e497"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5012db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      firmware_version: TT31
       model: ST600MM0088
-      rev: TT31
       size: 600127266816
       vendor: SEAGATE
   supported_job_types: