diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
index 52c65b42a0d2daacadc0ff51cf6000542e591fcc..b62c4bc3ad0de63f1f0f3098891675c534c9f4b2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.10",
       "ip6": "fe80::2e0:81ff:fed5:6d0",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:d0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-10.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/7",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:d1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:d2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6d",
       "interface": "InfiniBand",
       "ip": "172.18.64.10",
-      "ip6": "fe80::202:c903:b:916d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-10-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e2a7ff",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
index 9f7f6e742950e781a5fabb1c0a811a50a4de75c6..5ac127a71500e646183566900bf76043793dde7c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.100",
       "ip6": "fe80::2e0:81ff:fed5:7cc",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:cc",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-100.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/25",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:cd",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:ce",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -107,12 +117,13 @@
       "ip6": "fe80::202:c903:b:5d0d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-100-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +134,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cd4d",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
index 2e59a72d802a4e69cf966fc3de43582c56587827..734190c11910a0f68bf25f7ca00b0ac6b602f4e6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.101",
       "ip6": "fe80::2e0:81ff:fed5:6a0",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:a0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-101.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/28",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:a1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:a2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d9",
       "interface": "InfiniBand",
       "ip": "172.18.64.101",
-      "ip6": "fe80::202:c903:b:5cd9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-101-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93b81",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
index 6958f49aedf0c558b03a64117dddea8c787c55f9..d03e7104481c57a91dd15dc12e0a8919c58681e1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.103",
       "ip6": "fe80::2e0:81ff:fed5:8c8",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:c8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-103.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/30",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:c9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:ca",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:49",
       "interface": "InfiniBand",
       "ip": "172.18.64.103",
-      "ip6": "fe80::202:c903:b:5d49",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-103-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93a91",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
index 0efed90e9bcb855540d42f5ae974521799196db8..e04a55fff96439cc9216637b8b00689b3296c836 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.104",
       "ip6": "fe80::2e0:81ff:fed5:764",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:64",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-104.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/29",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:65",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:66",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:15",
       "interface": "InfiniBand",
       "ip": "172.18.64.104",
-      "ip6": "fe80::202:c903:b:5d15",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-104-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69fb9",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
index 15bf66a047845ef55fe5ba69c618074b27406329..337f63d5c6502ef3838d2f0581ee34db2824e947 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.105",
       "ip6": "fe80::2e0:81ff:fed5:6bc",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:bc",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-105.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/1",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:bd",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:be",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:19",
       "interface": "InfiniBand",
       "ip": "172.18.64.105",
-      "ip6": "fe80::202:c903:b:5d19",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-105-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e70d39",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
index bf79be29a902cf8a8cd59fb629f70f2f9ac4f31f..cce1fdbc79f81cf57e504aee155a41253a257e2b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.106",
       "ip6": "fe80::2e0:81ff:fed5:7f4",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:f4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-106.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/2",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:f5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:f6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ad",
       "interface": "InfiniBand",
       "ip": "172.18.64.106",
-      "ip6": "fe80::202:c903:b:5cad",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-106-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69f32",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
index 7c5ae61dbdb53cef08d6e6c73e57c16fe5c1a851..e595f30d5e98b7506673c32384780212d20a6f88 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.107",
       "ip6": "fe80::2e0:81ff:fed5:7c8",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:c8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-107.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/3",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:c9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:ca",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3d",
       "interface": "InfiniBand",
       "ip": "172.18.64.107",
-      "ip6": "fe80::202:c903:b:5d3d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-107-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93b4b",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
index 7b02c91aaa143ae94e380f732cad410c725b2f39..f2d2a2dab380093fed0f37a002e0f72341565920 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.108",
       "ip6": "fe80::2e0:81ff:fed5:714",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:14",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-108.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/4",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:15",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:16",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:21",
       "interface": "InfiniBand",
       "ip": "172.18.64.108",
-      "ip6": "fe80::202:c903:b:5d21",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-108-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93b53",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
index dab1b67c0adef1909f6e9b11d087c7648909597c..f0efb0d720218ae041b22836d011fd2abb3b29f4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.109",
       "ip6": "fe80::2e0:81ff:fed5:830",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:30",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-109.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/5",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:31",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:32",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:25",
       "interface": "InfiniBand",
       "ip": "172.18.64.109",
-      "ip6": "fe80::202:c903:b:5d25",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-109-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fc8e",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
index 5c25c74b189c668d5bc62c1c4642b53ef9e89f9f..601d962c3b018a69f60539517c1d8a029ea09722 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.11",
       "ip6": "fe80::2e0:81ff:fed5:87c",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:7c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-11.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/10",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:7d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:7e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:71",
       "interface": "InfiniBand",
       "ip": "172.18.64.11",
-      "ip6": "fe80::202:c903:b:9171",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-11-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e5f35c",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
index f4cb2803f1494f3994c4cb8bf4c9c54ef0c92beb..da9c11f24505afae14f5a36b2841c7544266c134 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.110",
       "ip6": "fe80::2e0:81ff:fed5:76c",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:6c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-110.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/6",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:6d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:6e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:a9",
       "interface": "InfiniBand",
       "ip": "172.18.64.110",
-      "ip6": "fe80::202:c903:b:5ca9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-110-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93a8c",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
index c38d874da6c730aed95ba05b9e67932bf9e49326..fb6c21bdf7aa638a0474f5482f4b067ecfd30d5d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.111",
       "ip6": "fe80::2e0:81ff:fed5:858",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:58",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-111.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/7",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:59",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:5a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:91",
       "interface": "InfiniBand",
       "ip": "172.18.64.111",
-      "ip6": "fe80::202:c903:c:5591",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-111-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901fe",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
index cd2eab695237019cafb704ae8dcbba51f07c20d0..58b057b16556e5fba4c66c1139a2f248adb6b163 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.112",
       "ip6": "fe80::2e0:81ff:fed5:810",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:10",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-112.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/8",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:11",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:12",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9d",
       "interface": "InfiniBand",
       "ip": "172.18.64.112",
-      "ip6": "fe80::202:c903:b:7e9d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-112-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ed3",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
index 816fc8b9e04a740ea1d86a9ca65b743526803e0c..b7e6c1d24bc2f9cd666ebfd0d10c61755bbf2f0f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.113",
       "ip6": "fe80::2e0:81ff:fed5:7bc",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:bc",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-113.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/9",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:bd",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:be",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b5",
       "interface": "InfiniBand",
       "ip": "172.18.64.113",
-      "ip6": "fe80::202:c903:b:93b5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-113-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93ac0",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
index 1f39360719c7e5c80e66e0ae1485faf6fb961bd1..af694bb7c6792397d80d26ba55effd1b446199a9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.114",
       "ip6": "fe80::2e0:81ff:fed5:6b0",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:b0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-114.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/10",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:b1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:b2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c5",
       "interface": "InfiniBand",
       "ip": "172.18.64.114",
-      "ip6": "fe80::202:c903:b:93c5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-114-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ece",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
index 9d6c74fab3c4468cc0b9222c4356c21e3fa47f1e..4c5d2841fa8ad5d7232a00c5588112c235c4630a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.115",
       "ip6": "fe80::2e0:81ff:fed5:804",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:04",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-115.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/11",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:05",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:06",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:05",
       "interface": "InfiniBand",
       "ip": "172.18.64.115",
-      "ip6": "fe80::202:c903:b:9305",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-115-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fcf0",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
index 3970b35f79f9bc5b7669b6e6459fd91527548b20..ba7589dd0cc3a51ab41ba0efffd021ff06c17a45 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.116",
       "ip6": "fe80::2e0:81ff:fed5:828",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:28",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-116.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/12",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:29",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:2a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1d",
       "interface": "InfiniBand",
       "ip": "172.18.64.116",
-      "ip6": "fe80::202:c903:b:931d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-116-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93aa5",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
index 05a958bd17959674204ee3f10b9444197a93d243..8bfb88df1d9753d657d518e5eb8f348e4c78f1f2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.117",
       "ip6": "fe80::2e0:81ff:fed5:6e4",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:e4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-117.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/13",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:e5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:e6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:25",
       "interface": "InfiniBand",
       "ip": "172.18.64.117",
-      "ip6": "fe80::202:c903:b:9325",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-117-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93ac2",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
index 15a4b6c1931c13a3823ecf175e78a873e490d03f..df3bf9dd56c4382244de97c3af31490a277ca9c1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.118",
       "ip6": "fe80::2e0:81ff:fed5:7b8",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:b8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-118.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/14",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:b9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:ba",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d9",
       "interface": "InfiniBand",
       "ip": "172.18.64.118",
-      "ip6": "fe80::202:c903:b:92d9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-118-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e98452",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
index dca19209f5cccd87a693006794694e42d220226f..051997e1467b9a75dd0651138ea8d528f6c891bd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.119",
       "ip6": "fe80::2e0:81ff:fed5:6f0",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:f0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-119.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/15",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:f1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:f2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:19",
       "interface": "InfiniBand",
       "ip": "172.18.64.119",
-      "ip6": "fe80::202:c903:b:9319",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-119-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93ac9",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
index 3aa082091a29cc1092e71cc76757f8874201ab43..332c127b2a5788790b5a72fd1f888040d4c78a53 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.12",
       "ip6": "fe80::2e0:81ff:fed5:78c",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:8c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-12.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/9",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:8d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:8e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:81",
       "interface": "InfiniBand",
       "ip": "172.18.64.12",
-      "ip6": "fe80::202:c903:b:9381",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-12-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371df3bd5",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
index ede4c0d65c9a2acd54f19beed920758ac0351c00..42848fa41edcf66062fd464da3444e8d24ace639 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.120",
       "ip6": "fe80::2e0:81ff:fed5:8ac",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:ac",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-120.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/16",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:ad",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:ae",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:29",
       "interface": "InfiniBand",
       "ip": "172.18.64.120",
-      "ip6": "fe80::202:c903:b:9329",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-120-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69f52",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
index 6ffce802dc70278ca99bc4fe14951cc64c88c7b4..a6e64e929455f8051b98a319088a84978ae7ab7e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.121",
       "ip6": "fe80::2e0:81ff:fed5:738",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:38",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-121.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/17",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:39",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:3a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -107,12 +117,13 @@
       "ip6": "fe80::202:c903:b:932d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-121-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +134,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +212,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cd7b",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
index 7e41538e8553f77c3fea82580d5ae12e114e72c2..85229a2823ce55da34a7f01f5c2ec1a4a4377cf8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.122",
       "ip6": "fe80::2e0:81ff:fed5:838",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:38",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-122.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/18",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:39",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:3a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:85",
       "interface": "InfiniBand",
       "ip": "172.18.64.122",
-      "ip6": "fe80::202:c903:b:5d85",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-122-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60ba2",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
index 6839227f434a5d8939e10f73a80c12b92fdd6f8a..66c363cb16136e13d747fd6e0164c6e8acad59bc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.124",
       "ip6": "fe80::2e0:81ff:fed5:6a4",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:a4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-124.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/20",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:a5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:a6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61",
       "interface": "InfiniBand",
       "ip": "172.18.64.124",
-      "ip6": "fe80::202:c903:2:7f61",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-124-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e669a0",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
index e0af922a3dc322b1e8619cd5943edb9af78f5a27..7db798a605e618c340a35ca90271eacea9aa350e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.125",
       "ip6": "fe80::2e0:81ff:fed5:868",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:68",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-125.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/21",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:69",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:6a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:91",
       "interface": "InfiniBand",
       "ip": "172.18.64.125",
-      "ip6": "fe80::202:c903:b:9391",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-125-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe1f",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
index d176c7a05cdb7d8815c7e94a3e45e42a6ab99a7f..561c295ca38ee49fdb7b508117e18a4902c15fc4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.127",
       "ip6": "fe80::2e0:81ff:fed5:840",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:40",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-127.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/23",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:41",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:42",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:85",
       "interface": "InfiniBand",
       "ip": "172.18.64.127",
-      "ip6": "fe80::202:c903:b:9285",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-127-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe0f",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
index b2b0cfc91fb6df53cf6112333b58879540ee2cb9..104a645721b3247db5897df2a9bce4047619adc6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.128",
       "ip6": "fe80::2e0:81ff:fed5:8e4",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:e4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-128.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/24",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:e5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:e6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:15",
       "interface": "InfiniBand",
       "ip": "172.18.64.128",
-      "ip6": "fe80::202:c903:b:9215",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-128-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901ec",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
index d2dc37898f4fedd41de5237020ad24d001e97614..971c3d08da73f012144365f516dd857d8bb716d4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.129",
       "ip6": "fe80::2e0:81ff:fed5:71c",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:1c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-129.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/25",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:1d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:1e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:05",
       "interface": "InfiniBand",
       "ip": "172.18.64.129",
-      "ip6": "fe80::202:c903:b:9205",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-129-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cd7c",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
index 6ae30ea86b6775318a999c63ccb20ed6143bc9b2..52cf9a0d0b0f631ef2b8923cddaec7bbbaa3ba12 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.13",
       "ip6": "fe80::2e0:81ff:fed5:6fc",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:fc",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-13.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/14",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:fd",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:fe",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:85",
       "interface": "InfiniBand",
       "ip": "172.18.64.13",
-      "ip6": "fe80::202:c903:b:9385",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-13-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e2ae6c",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
index b6b1ac70ff1ea2ba70dac5b121aa6c6dec1c9a6e..d344584b38cedab0ac341500e86cd9c817229573 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.130",
       "ip6": "fe80::2e0:81ff:fed2:5a34",
       "kavlan": true,
       "mac": "00:e0:81:d2:5a:34",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-130.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/26",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d2:5a:35",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d2:5a:36",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:09",
       "interface": "InfiniBand",
       "ip": "172.18.64.130",
-      "ip6": "fe80::202:c903:b:9209",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-130-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901df",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
index 046088171e043fa0bbb0e0a33b6fadd1df007200..ddd5dd4aa1db580dddb5306aff7cc83c35365a5e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.131",
       "ip6": "fe80::2e0:81ff:fed5:6f8",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:f8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-131.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/27",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:f9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:fa",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d",
       "interface": "InfiniBand",
       "ip": "172.18.64.131",
-      "ip6": "fe80::202:c903:b:914d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-131-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e722b5",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
index f8908ecc46e327f6c09b61e5c6add971522e61ad..d0e2fbe72483f8a41dcef4de887e4480f94f83bf 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.132",
       "ip6": "fe80::2e0:81ff:fed5:88c",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:8c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-132.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/28",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:8d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:8e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -107,12 +117,13 @@
       "ip6": "fe80::202:c903:b:920d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-132-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +134,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +212,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6a3a3",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
index dc57f5d723d07f7c7f2deb83085b549c4f9f39af..465e0798674a647636052ba1b98b29f3b163c73b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.133",
       "ip6": "fe80::2e0:81ff:fed5:7e0",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:e0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-133.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/29",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:e1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:e2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b3",
       "interface": "InfiniBand",
       "ip": "172.18.64.133",
-      "ip6": "fe80::202:c903:5:f7b3",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-133-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60bd7",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
index a30573f64a3d7217ca9ffb76201fb248ad226a73..6384dc0f288f33a5f5c797657824c27e286beb56 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.134",
       "ip6": "fe80::2e0:81ff:fed5:8e8",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:e8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-134.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/30",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:e9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:ea",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:4f",
       "interface": "InfiniBand",
       "ip": "172.18.64.134",
-      "ip6": "fe80::202:c903:5:f44f",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-134-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ffe9",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
index 3fff3f1c3b1e9a704ae544a5d16bee584c1a87eb..236c8c58e01486dd2d73d544bf6e850a7bd73ece 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.135",
       "ip6": "fe80::2e0:81ff:fed5:670",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:70",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-135.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/31",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:71",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:72",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c7",
       "interface": "InfiniBand",
       "ip": "172.18.64.135",
-      "ip6": "fe80::202:c903:5:f4c7",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-135-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e98413",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
index 98adfc4070b597a622b9b09c9af7c2565e187af9..809c713ebf11d0b66b8d24373c65f4190fa11c0b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.136",
       "ip6": "fe80::2e0:81ff:fed5:77c",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:7c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-136.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/32",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:7d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:7e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:47",
       "interface": "InfiniBand",
       "ip": "172.18.64.136",
-      "ip6": "fe80::202:c903:5:f847",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-136-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e90000",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
index a35b639387dd67332d30c4a1f5d04513dde39200..a586827ad6360b714d19ec083296033a822df6a9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.137",
       "ip6": "fe80::2e0:81ff:fed5:844",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:44",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-137.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/33",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:45",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:46",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:47",
       "interface": "InfiniBand",
       "ip": "172.18.64.137",
-      "ip6": "fe80::202:c903:5:f647",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-137-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e95045",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
index 0af832fda939968bc2508e0cfdeb2aebe9d2f8a4..55d020f531f331a1d1d3df5cc300a15869b8114c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.138",
       "ip6": "fe80::2e0:81ff:fed5:8c4",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:c4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-138.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/34",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:c5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:c6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c3",
       "interface": "InfiniBand",
       "ip": "172.18.64.138",
-      "ip6": "fe80::202:c903:5:f4c3",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-138-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fdf6",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
index d352296c58dbffc7cb1043e4bc9320b8fbba457d..1ce74e48f87275c35f0731f8710ce6c92f27a726 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.139",
       "ip6": "fe80::2e0:81ff:fed5:780",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:80",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-139.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/35",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:81",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:82",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:ff",
       "interface": "InfiniBand",
       "ip": "172.18.64.139",
-      "ip6": "fe80::202:c903:5:f7ff",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-139-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe04",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
index 5eaaa91da60ba2b878717c3d780bfb4b9754d87b..86102eb80cf2b88c1ac804190fbde4a55fff46e4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.14",
       "ip6": "fe80::2e0:81ff:fed5:6d4",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:d4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-14.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/13",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:d5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:d6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e1",
       "interface": "InfiniBand",
       "ip": "172.18.64.14",
-      "ip6": "fe80::202:c903:b:93e1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-14-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371dfa661",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
index 8d640f13363c2d36e2a6d601beb5e29e7b6dc683..9a9ac4ab509ddfb7c745dd598ec44b8d5a0dd50a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.140",
       "ip6": "fe80::2e0:81ff:fed5:778",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:78",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-140.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/36",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:79",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:7a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:9f",
       "interface": "InfiniBand",
       "ip": "172.18.64.140",
-      "ip6": "fe80::202:c903:5:f79f",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-140-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cdbb",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
index be4bee5399ee65f7c79f2c3d5bd3bbbb2775dc33..d9828ca7ddce3a00c110382c80ab6c6b657405f3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.142",
       "ip6": "fe80::2e0:81ff:fed5:68c",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:8c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-142.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/38",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:8d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:8e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a7",
       "interface": "InfiniBand",
       "ip": "172.18.64.142",
-      "ip6": "fe80::202:c903:5:f7a7",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-142-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60c3a",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
index f8a6753d4f64ba54ba11d0c03cd336714de5fe5e..e208f4257c8a0773b2646ee2e39d9906f2f7771b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.143",
       "ip6": "fe80::2e0:81ff:fed5:794",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:94",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-143.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene4",
       "switch_port": "GigabitEthernet1/0/39",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:95",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:96",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:97",
       "interface": "InfiniBand",
       "ip": "172.18.64.143",
-      "ip6": "fe80::202:c903:5:f497",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-143-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -200,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fcbd",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
index 97783084b674b525c7e7a606cd27b47d8f5896a1..54b01460e0bd58e28f7d6b98471f2531ee62631a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.15",
       "ip6": "fe80::2e0:81ff:fed5:7e8",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:e8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-15.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/16",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:e9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:ea",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c9",
       "interface": "InfiniBand",
       "ip": "172.18.64.15",
-      "ip6": "fe80::202:c903:b:93c9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-15-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e68f5e",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
index a4e66f9dd15a7f1e4eb7cc84b95ccd95af81b1e9..1e77f28700900192f349ab7c325bcc21d5333c27 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.16",
       "ip6": "fe80::2e0:81ff:fed5:7c0",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:c0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-16.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/15",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:c1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:c2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:75",
       "interface": "InfiniBand",
       "ip": "172.18.64.16",
-      "ip6": "fe80::202:c903:b:9375",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-16-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e75540",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
index 191bd6c5a9cd75c5660034e9e4efa6d16ab64a86..93c15f5b1a656e4a5c0f7f4ea0548be548a23937 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.17",
       "ip6": "fe80::2e0:81ff:fed5:8a8",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:a8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-17.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/18",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:a9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:aa",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:71",
       "interface": "InfiniBand",
       "ip": "172.18.64.17",
-      "ip6": "fe80::202:c903:b:9371",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-17-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371df3aa3",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
index 531348661be05dfda6f7d6bb1daa64124a7c39db..8ac8ee091e9aefcab7d40c232db0649f4a4a4ac5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.18",
       "ip6": "fe80::2e0:81ff:fed5:83c",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:3c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-18.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/17",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:3d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:3e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7d",
       "interface": "InfiniBand",
       "ip": "172.18.64.18",
-      "ip6": "fe80::202:c903:b:937d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-18-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e70ca5",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
index f6131352e63e0df9b27c649b38ea034f32713e5b..550b0f7fdaac154e88aefb06808d38324ac3375a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.19",
       "ip6": "fe80::2e0:81ff:fed5:8b4",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:b4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-19.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/20",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:b5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:b6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:55",
       "interface": "InfiniBand",
       "ip": "172.18.64.19",
-      "ip6": "fe80::202:c903:b:9155",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-19-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371dfa662",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
index e01fe4fc43680b3d6b36b6238691a4a44103c228..9bef4079455bd18d1134bfe98fb76bbfb9a4c2f3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.2",
       "ip6": "fe80::2e0:81ff:fed5:770",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:70",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-2.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/1",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:71",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:72",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5d",
       "interface": "InfiniBand",
       "ip": "172.18.64.2",
-      "ip6": "fe80::202:c903:b:915d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-2-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6fd31",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
index bec2dbabbd66d1e3c83e8d206300a41c1e5a9214..055c3c247f4780271828a50804dc7a93aaeb1f12 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.20",
       "ip6": "fe80::2e0:81ff:fed5:768",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:68",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-20.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/19",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:69",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:6a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:45",
       "interface": "InfiniBand",
       "ip": "172.18.64.20",
-      "ip6": "fe80::202:c903:b:9145",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-20-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e73c2d",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
index 923471777870fba2d82f38c9747db708ce364a54..9042fa956560c69233b10e9500f5795331edfb74 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.21",
       "ip6": "fe80::2e0:81ff:fed2:59f8",
       "kavlan": true,
       "mac": "00:e0:81:d2:59:f8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-21.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/22",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d2:59:f9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d2:59:fa",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6d",
       "interface": "InfiniBand",
       "ip": "172.18.64.21",
-      "ip6": "fe80::202:c903:4:536d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-21-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe4f",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
index 43a66f3d17fbb0f30c69d84b69739d891d615b30..f9b8e0681f481afa965d37ccdc0339d4caa84804 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.22",
       "ip6": "fe80::2e0:81ff:fed5:7d8",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:d8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-22.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/21",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:d9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:da",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:79",
       "interface": "InfiniBand",
       "ip": "172.18.64.22",
-      "ip6": "fe80::202:c903:b:9379",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-22-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ef4",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
index 76b1b87c43b69ec3445cd823745273cfd3b187d1..e55eae24c7c5d98e037986864d4388acce67b732 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.23",
       "ip6": "fe80::2e0:81ff:fed5:6c4",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:c4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-23.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/24",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:c5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:c6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:65",
       "interface": "InfiniBand",
       "ip": "172.18.64.23",
-      "ip6": "fe80::202:c903:b:9365",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-23-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901f8",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
index 1ef60630185bca24ee0bbc215a4b87e7876e012b..f5c5fac756271214b09a03574b814742c41a670a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.24",
       "ip6": "fe80::2e0:81ff:fed5:710",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:10",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-24.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/23",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:11",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:12",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:cd",
       "interface": "InfiniBand",
       "ip": "172.18.64.24",
-      "ip6": "fe80::202:c903:b:92cd",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-24-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6a448",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
index 75bceb4d5dfeac9187845e6e116e0485e64f5556..8f667290e4671fc74bb5e6eab2a4c988cef69625 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.25",
       "ip6": "fe80::2e0:81ff:fed5:750",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:50",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-25.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/26",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:51",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:52",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a5",
       "interface": "InfiniBand",
       "ip": "172.18.64.25",
-      "ip6": "fe80::202:c903:b:92a5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-25-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69f03",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
index dfe15cbffed8c5eb75b1393f8c3ecfd76550eb1d..9c1b972a2b8288101e07a406b3d130d1d31f8eef 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.27",
       "ip6": "fe80::2e0:81ff:fed5:75c",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:5c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-27.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/28",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:5d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:5e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:89",
       "interface": "InfiniBand",
       "ip": "172.18.64.27",
-      "ip6": "fe80::202:c903:b:9289",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-27-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce39",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
index 30cff200c318af3b8c88e8335bcac26457d15d83..8e0d3f202d2c4a113403e1de9adbeca3f72fe1df 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.29",
       "ip6": "fe80::2e0:81ff:fed5:654",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:54",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-29.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/30",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:55",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:56",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:dd",
       "interface": "InfiniBand",
       "ip": "172.18.64.29",
-      "ip6": "fe80::202:c903:b:90dd",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-29-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce23",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
index 12549cc8ff508ccebea8c77655466016cb149796..4a068abf841e9f6c4e4bc0055e43ee729f5178de 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.30",
       "ip6": "fe80::2e0:81ff:fed5:8ec",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:ec",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-30.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/29",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:ed",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:ee",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -107,12 +117,13 @@
       "ip6": "fe80::202:c903:b:9279",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-30-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +134,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce27",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
index f6f389b7f9f550bf85c2be1675721d4fed96847f..35c291c16835e36959b84f4b9da7d1deca318691 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.31",
       "ip6": "fe80::2e0:81ff:fed5:660",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:60",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-31.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/32",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:61",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:62",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1d",
       "interface": "InfiniBand",
       "ip": "172.18.64.31",
-      "ip6": "fe80::202:c903:b:921d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-31-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ee5",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
index 3ddccee196a782b26a60035441b6e4d710d77440..af342379cea2c22eb27ba48c8e851389f676b9d8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.32",
       "ip6": "fe80::2e0:81ff:fed5:6c8",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:c8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-32.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/31",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:c9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:ca",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7d",
       "interface": "InfiniBand",
       "ip": "172.18.64.32",
-      "ip6": "fe80::202:c903:b:927d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-32-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69efc",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
index 84b38337a782f02c5fea98232c5869dbdbea7a8d..e7b0fcd1ceec47168e12d7e5e642664d8281b502 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.33",
       "ip6": "fe80::2e0:81ff:fed5:66c",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:6c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-33.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/34",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:6d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:6e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:d9",
       "interface": "InfiniBand",
       "ip": "172.18.64.33",
-      "ip6": "fe80::202:c903:b:90d9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-33-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ecf",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
index 3b8b1f13381ce283f749ed8f0235bb831fd0b01a..2161c5f93cc402897088f83a368160ab402c3718 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.34",
       "ip6": "fe80::2e0:81ff:fed5:89c",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:9c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-34.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/33",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:9d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:9e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -107,12 +117,13 @@
       "ip6": "fe80::202:c903:b:9165",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-34-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +134,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e902da",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
index 5f391d11ace96c5b675be7187aae5a3731719083..0d87f23b874cfd46b8f0ce5498a9f410547ef003 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.35",
       "ip6": "fe80::2e0:81ff:fed5:81c",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:1c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-35.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/36",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:1d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:1e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:ef",
       "interface": "InfiniBand",
       "ip": "172.18.64.35",
-      "ip6": "fe80::202:c903:1:d5ef",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-35-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e90217",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
index 2c76b93e3b93829589689d4746d1eb6a96d1adad..3e91db050e0e96bde41be7e2455aefa7d9f6ecdb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.37",
       "ip6": "fe80::2e0:81ff:fed5:8a4",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:a4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-37.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/38",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:a5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:a6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c5",
       "interface": "InfiniBand",
       "ip": "172.18.64.37",
-      "ip6": "fe80::202:c903:b:92c5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-37-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901e5",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
index f8cdfb11c831ef8993ea0d0fed4ad2229231daa6..885e131829db61853fe644661ba854f4423c5d7c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.38",
       "ip6": "fe80::2e0:81ff:fed5:730",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:30",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-38.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/37",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:31",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:32",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b1",
       "interface": "InfiniBand",
       "ip": "172.18.64.38",
-      "ip6": "fe80::202:c903:b:92b1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-38-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901e9",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
index 396e58d365e141a3c21d9443f185e65c6ebe5cfd..f19fa5ded05703875accbcba30729a5da496dcc9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.4",
       "ip6": "fe80::2e0:81ff:fed5:854",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:54",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-4.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/3",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:55",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:56",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd",
       "interface": "InfiniBand",
       "ip": "172.18.64.4",
-      "ip6": "fe80::202:c903:b:92bd",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-4-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b9b",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
index f954dd2bd988adceefecb1480c14d69a6bba2d82..4d172177edc6f03bbb80c8e98e5570ff3311a178 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.41",
       "ip6": "fe80::2e0:81ff:fed5:7ac",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:ac",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-41.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/2",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:ad",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:ae",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:99",
       "interface": "InfiniBand",
       "ip": "172.18.64.41",
-      "ip6": "fe80::202:c903:b:9299",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-41-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe3b",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
index 68443c29371e01b58fc2c343beab72dacd36ddb5..1dbb664029b44e53d1b30c534c2a2d4595dca32c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.42",
       "ip6": "fe80::2e0:81ff:fed5:788",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:88",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-42.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/3",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:89",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:8a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a9",
       "interface": "InfiniBand",
       "ip": "172.18.64.42",
-      "ip6": "fe80::202:c903:b:92a9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-42-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6d13d",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
index 689f290fd0cf65f29481e5a23b9b4c9d67cf97e7..ec86eea1a70488385b9abb555fb61fa93fe77f4b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.43",
       "ip6": "fe80::2e0:81ff:fed5:824",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:24",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-43.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/4",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:25",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:26",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ad",
       "interface": "InfiniBand",
       "ip": "172.18.64.43",
-      "ip6": "fe80::202:c903:b:92ad",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-43-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93c32",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
index 637d8f4c5ea5022706bd76403cde5fced3fb99e7..d15c3b9c5690292af20bd8cf44a6a93eba59bf31 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.44",
       "ip6": "fe80::2e0:81ff:fed5:6e0",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:e0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-44.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/5",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:e1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:e2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b5",
       "interface": "InfiniBand",
       "ip": "172.18.64.44",
-      "ip6": "fe80::202:c903:b:92b5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-44-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6a746",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
index e53ae673e02c5cf6961e40097415d96a498c7741..a903f003406cda4b62f762161fcf93eb0aa621ee 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.45",
       "ip6": "fe80::2e0:81ff:fed5:65c",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:5c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-45.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/6",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:5d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:5e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:21",
       "interface": "InfiniBand",
       "ip": "172.18.64.45",
-      "ip6": "fe80::202:c903:b:9321",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-45-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca34de8f88e",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "GM3OA5CA",
       "interface": "SATA II",
       "model": "Hitachi HDP72503",
-      "rev": "GM3OA5CA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
index 6f5a28113b14a308f226df84e8d2a1ed919661cd..4a9012106ff9db2cc91cad4e52b228a66a0f2a86 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.46",
       "ip6": "fe80::2e0:81ff:fed5:694",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:94",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-46.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/7",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:95",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:96",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d5",
       "interface": "InfiniBand",
       "ip": "172.18.64.46",
-      "ip6": "fe80::202:c903:b:93d5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-46-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e90220",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
index c03360adc0600efdb779cb1ef48a960b324d6900..bf1e54241a4c977a07296b6fafd12cc2e35a2bb4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.47",
       "ip6": "fe80::2e0:81ff:fed5:894",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:94",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-47.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/8",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:95",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:96",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e5",
       "interface": "InfiniBand",
       "ip": "172.18.64.47",
-      "ip6": "fe80::202:c903:b:93e5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-47-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe33",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
index 056ac81a605bf042fecc65ae2255b88b03c1a923..5453501620bf4691856943e73663055adc8bcac0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.48",
       "ip6": "fe80::2e0:81ff:fed5:6e8",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:e8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-48.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/9",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:e9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:ea",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:dd",
       "interface": "InfiniBand",
       "ip": "172.18.64.48",
-      "ip6": "fe80::202:c903:b:93dd",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-48-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cee9",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
index 4d714541b493604b9102fe11a6a2735da4fd5ce9..e7739cbe97cdeec0fd07ea9d4503596c2db3cc00 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.49",
       "ip6": "fe80::2e0:81ff:fed5:85c",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:5c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-49.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/10",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:5d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:5e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d1",
       "interface": "InfiniBand",
       "ip": "172.18.64.49",
-      "ip6": "fe80::202:c903:b:93d1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-49-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6d249",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
index eafc0a05c9e704d7dba163462fd38b6d175dc1a4..f47540c8ef878f3dd617ec732725f9f6e7739f90 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.5",
       "ip6": "fe80::2e0:81ff:fed5:8b8",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:b8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-5.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/6",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:b9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:ba",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:79",
       "interface": "InfiniBand",
       "ip": "172.18.64.5",
-      "ip6": "fe80::202:c903:b:9179",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-5-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e7027a",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
index 2fdd136bfc98758912a57ae2fc49acc8b92ceffa..52bb17d3e7c3508b24c0b58952286e309300a7e3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.51",
       "ip6": "fe80::2e0:81ff:fed5:760",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:60",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-51.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/12",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:61",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:62",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e9",
       "interface": "InfiniBand",
       "ip": "172.18.64.51",
-      "ip6": "fe80::202:c903:b:92e9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-51-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e66eb9",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
index 4a04a7438afaa7fda67f9106a2358f171cfee248..634c859064d5293f5cd8cf1fc509ca9f1586fd62 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.52",
       "ip6": "fe80::2e0:81ff:fed5:70c",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:0c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-52.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/13",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:0d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:0e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f9",
       "interface": "InfiniBand",
       "ip": "172.18.64.52",
-      "ip6": "fe80::202:c903:b:92f9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-52-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6d1e4",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
index b0b457f1e87600eecbc8f84632b7f217804d709e..287db16f5b468437f32e714770db6a174b41ffca 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.53",
       "ip6": "fe80::2e0:81ff:fed5:7f8",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:f8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-53.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/14",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:f9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:fa",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:09",
       "interface": "InfiniBand",
       "ip": "172.18.64.53",
-      "ip6": "fe80::202:c903:b:9309",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-53-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe1a",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
index 5787431b934267fa784a88cb689cbe9cd6103552..0b0a9a6a64b5eb4b2fbabeb6d533e184f294e523 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.54",
       "ip6": "fe80::2e0:81ff:fed5:7a8",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:a8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-54.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/15",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:a9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:aa",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:15",
       "interface": "InfiniBand",
       "ip": "172.18.64.54",
-      "ip6": "fe80::202:c903:b:9315",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-54-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e9022d",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
index 2b695d903a6776ec659b18dd15c6e39e098dde8c..99b19605afcad281239eb72babfe88a3379102cf 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.55",
       "ip6": "fe80::2e0:81ff:fed5:890",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:90",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-55.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/16",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:91",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:92",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0d",
       "interface": "InfiniBand",
       "ip": "172.18.64.55",
-      "ip6": "fe80::202:c903:b:930d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-55-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e90212",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
index 1463e7da10400a14c9be2901e9b97a67b31839cc..2521779ce7a238251d9798597a39119a53093375 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.57",
       "ip6": "fe80::2e0:81ff:fed5:8a0",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:a0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-57.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/18",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:a1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:a2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8d",
       "interface": "InfiniBand",
       "ip": "172.18.64.57",
-      "ip6": "fe80::202:c903:b:918d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-57-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e677a1",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
index 757537a07ef70ed1255d1e06eda142f4fd949192..22752ec3352dd3a2ceb0d0226ff748dde63f81da 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.58",
       "ip6": "fe80::2e0:81ff:fed5:734",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:34",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-58.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/19",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:35",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:36",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9d",
       "interface": "InfiniBand",
       "ip": "172.18.64.58",
-      "ip6": "fe80::202:c903:b:919d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-58-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca32bd48345",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "GM3OA52A",
       "interface": "SATA II",
       "model": "Hitachi HDP72503",
-      "rev": "GM3OA52A",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
index be13a7b112e8e1fd6ede448d479866c6d0aef098..aee608a419a3974d8890d2c83b2bfed3ed8a4b03 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.59",
       "ip6": "fe80::2e0:81ff:fed5:72c",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:2c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-59.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/20",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:2d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:2e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:95",
       "interface": "InfiniBand",
       "ip": "172.18.64.59",
-      "ip6": "fe80::202:c903:b:9195",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-59-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6d228",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
index 0287d2ecf8d4f09869615383460bd663682bfed5..96b2e849c5049491c5c82abdbb060654e1f05479 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.6",
       "ip6": "fe80::2e0:81ff:fed5:6ec",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:ec",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-6.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/5",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:ed",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:ee",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7d",
       "interface": "InfiniBand",
       "ip": "172.18.64.6",
-      "ip6": "fe80::202:c903:b:917d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-6-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371de258a",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
index 64918626f75fd070b9f82a2e64eeaa3b3701240e..ee7653dba3fe5abad38f87285da942d88f5cd2df 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.60",
       "ip6": "fe80::2e0:81ff:fed5:84c",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:4c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-60.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/21",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:4d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:4e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:85",
       "interface": "InfiniBand",
       "ip": "172.18.64.60",
-      "ip6": "fe80::202:c903:b:9185",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-60-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fdf9",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
index 7aab0b35daa022aac0d175be49300fcebb84e116..d2f26a8d1d8c8ad05998cf4e4a02130273559c1c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.61",
       "ip6": "fe80::2e0:81ff:fed5:700",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:00",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-61.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/22",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:01",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:02",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:91",
       "interface": "InfiniBand",
       "ip": "172.18.64.61",
-      "ip6": "fe80::202:c903:b:9191",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-61-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60bea",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
index 84393f7bff62a03d3327c8df1e35f6fa32fb648a..203e22ab4f90df025911394eb94b868c62589d61 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.62",
       "ip6": "fe80::2e0:81ff:fed5:7c4",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:c4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-62.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/23",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:c5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:c6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:99",
       "interface": "InfiniBand",
       "ip": "172.18.64.62",
-      "ip6": "fe80::202:c903:b:9199",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-62-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce37",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
index 37aeb8b1ac8ce686961863c6fbca4b4917573352..141f30edeca2a3ae338674e786c92da50fd57880 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.63",
       "ip6": "fe80::2e0:81ff:fed5:668",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:68",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-63.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/24",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:69",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:6a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:81",
       "interface": "InfiniBand",
       "ip": "172.18.64.63",
-      "ip6": "fe80::202:c903:b:9181",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-63-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b9a",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
index 01cbb97b1611a68fcb0655fbed7fd857612a6121..1ba55339bbd67fafd10cd98f7fcc076275aade6f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.64",
       "ip6": "fe80::2e0:81ff:fed5:888",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:88",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-64.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/25",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:89",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:8a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a1",
       "interface": "InfiniBand",
       "ip": "172.18.64.64",
-      "ip6": "fe80::202:c903:b:92a1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-64-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce47",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
index faaa46f7d9b12cfbcf016fc81e12d440b25f5f11..02b24a37a9aba8bb910495d26bbc18dfb014621a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.65",
       "ip6": "fe80::2e0:81ff:fed5:744",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:44",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-65.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/26",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:45",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:46",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -107,12 +117,13 @@
       "ip6": "fe80::202:c903:b:93d9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-65-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +134,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce3f",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
index b876df19fb3097b8d26b1b999466eb27b9fef4ca..2af7219a0978bc4e84e343ec3c6acda5671b9927 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.66",
       "ip6": "fe80::2e0:81ff:fed5:814",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:14",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-66.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/27",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:15",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:16",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:49",
       "interface": "InfiniBand",
       "ip": "172.18.64.66",
-      "ip6": "fe80::202:c903:b:9149",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-66-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce44",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
index eb9b7573af530f3c25555ceb52f4dfbd5eb3bb08..81c3609f3e26dc85ebee373a26b3a18fd43eca33 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.67",
       "ip6": "fe80::2e0:81ff:fed5:7b0",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:b0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-67.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/28",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:b1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:b2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b9",
       "interface": "InfiniBand",
       "ip": "172.18.64.67",
-      "ip6": "fe80::202:c903:b:93b9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-67-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce3c",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
index 7b9f3f89383ececd004be7e2d71b003d7bb37513..785490d55d617f9db6830f38ac8773ff3c0d91e5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.68",
       "ip6": "fe80::2e0:81ff:fed5:650",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:50",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-68.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/29",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:51",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:52",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:91",
       "interface": "InfiniBand",
       "ip": "172.18.64.68",
-      "ip6": "fe80::202:c903:b:9291",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-68-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b25",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
index a678fbe6f51ddd39f1e5b5562c758c813fec3503..a013dd94b72ef4e3e59add93178be34f31282941 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.69",
       "ip6": "fe80::2e0:81ff:fed5:698",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:98",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-69.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/30",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:99",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:9a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c1",
       "interface": "InfiniBand",
       "ip": "172.18.64.69",
-      "ip6": "fe80::202:c903:b:93c1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-69-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce33",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
index 0e244456d01ebe9a685508d678c75423677a365e..909860671ed02fa94678408d6793e6e79632541b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.7",
       "ip6": "fe80::2e0:81ff:fed5:73c",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:3c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-7.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/8",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:3d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:3e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:61",
       "interface": "InfiniBand",
       "ip": "172.18.64.7",
-      "ip6": "fe80::202:c903:b:9161",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-7-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e73c3e",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
index 6cd3623493e28aca57e156761d088bde83189d9e..848ef28b8b76024b2fa38baea8e58e488add48b9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.70",
       "ip6": "fe80::2e0:81ff:fed5:74c",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:4c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-70.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/31",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:4d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:4e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:11",
       "interface": "InfiniBand",
       "ip": "172.18.64.70",
-      "ip6": "fe80::202:c903:b:9311",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-70-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e66a94",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
index 62f0b7cafeb53d63373a1fc1612d3b79a3316ba9..bce38414d7ba2374ce72b96f653248dbf66cdc5e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.71",
       "ip6": "fe80::2e0:81ff:fed5:728",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:28",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-71.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/32",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:29",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:2a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ed",
       "interface": "InfiniBand",
       "ip": "172.18.64.71",
-      "ip6": "fe80::202:c903:b:92ed",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-71-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce2a",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
index 7ddd3c07168f765a2b0a70c5bc9965f93b9c276d..e56bcd8d4fe99b11fe05d483c6e9154130bb44b9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.72",
       "ip6": "fe80::2e0:81ff:fed5:7e4",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:e4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-72.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/33",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:e5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:e6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:95",
       "interface": "InfiniBand",
       "ip": "172.18.64.72",
-      "ip6": "fe80::202:c903:b:9295",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-72-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60bc4",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
index 1e05aee971f5030658d3ce319dcb044cc04001ad..d66073b88c3debb0ede504304b16186e937f3d18 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.73",
       "ip6": "fe80::2e0:81ff:fed5:740",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:40",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-73.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/34",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:41",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:42",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fd",
       "interface": "InfiniBand",
       "ip": "172.18.64.73",
-      "ip6": "fe80::202:c903:b:92fd",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-73-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce29",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
index ce0c62e559803885bb26431a19b994f3c0ce2b08..a5cd3c9dbaf47858f31fa755ba171e5c22ae8495 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.74",
       "ip6": "fe80::2e0:81ff:fed5:880",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:80",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-74.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene2",
       "switch_port": "GigabitEthernet1/0/35",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:81",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:82",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:dd",
       "interface": "InfiniBand",
       "ip": "172.18.64.74",
-      "ip6": "fe80::202:c903:b:92dd",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-74-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce87",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
index be1186981796b24ebbe07a69130ddc931d0fd061..f413ec71470a6d01681bb33727f988626b837d17 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.75",
       "ip6": "fe80::2e0:81ff:fed5:704",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:04",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-75.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/2",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:05",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:06",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e5",
       "interface": "InfiniBand",
       "ip": "172.18.64.75",
-      "ip6": "fe80::202:c903:b:92e5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-75-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce35",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
index 5c9fb0551b22699890382d6495e36a2a4e50723d..a3ff7642f6cf4f746ed788985f7a81d6917b4985 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.76",
       "ip6": "fe80::2e0:81ff:fed5:720",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:20",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-76.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/1",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:21",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:22",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5",
       "interface": "InfiniBand",
       "ip": "172.18.64.76",
-      "ip6": "fe80::202:c903:b:92d5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-76-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce34",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
index e8dd771b35d34356f1c49d9ff2b556395a6b2506..c3788e8dad08d28de2e88f4135201dbb8c481fee 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.77",
       "ip6": "fe80::2e0:81ff:fed5:7a0",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:a0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-77.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/4",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:a1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:a2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e1",
       "interface": "InfiniBand",
       "ip": "172.18.64.77",
-      "ip6": "fe80::202:c903:b:92e1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-77-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce28",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
index f8758a8d9ed6daad71ab802cefc7d0d1164fbe9c..6012a0eae1a341eaa29f6243e164cd86f4d3d912 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.78",
       "ip6": "fe80::2e0:81ff:fed5:850",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:50",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-78.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/3",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:51",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:52",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:01",
       "interface": "InfiniBand",
       "ip": "172.18.64.78",
-      "ip6": "fe80::202:c903:b:9301",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-78-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60bc8",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
index d0a4783906652c48a1a888c91113cd8ab8ce5623..905615acbcbb52bcb45797160701b4e126acaf8a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.79",
       "ip6": "fe80::2e0:81ff:fed5:878",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:78",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-79.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/6",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:79",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:7a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f5",
       "interface": "InfiniBand",
       "ip": "172.18.64.79",
-      "ip6": "fe80::202:c903:b:92f5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-79-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901f3",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
index 49aad96ea1cf6093e9f1cd9821056e2a2d110bdd..1192e0254fd6e7f68809e3ababdb35f8302bf314 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.8",
       "ip6": "fe80::2e0:81ff:fed5:808",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:08",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-8.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/12",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:09",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:0a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:75",
       "interface": "InfiniBand",
       "ip": "172.18.64.8",
-      "ip6": "fe80::202:c903:b:9175",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-8-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e70e50",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
index 6a599e033a917a8793c72c6a59bd3df83d6d051b..dbd312dd5a64fd8a9b3ed6b5818a907e043fdab6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.80",
       "ip6": "fe80::2e0:81ff:fed5:6d8",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:d8",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-80.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/5",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:d9",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:da",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d1",
       "interface": "InfiniBand",
       "ip": "172.18.64.80",
-      "ip6": "fe80::202:c903:b:92d1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-80-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b2a",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
index c104000e2b6cd77e971af3882b3ca56d84ff7e15..c7f01a00ecdb92436c3ccb66d7e8a9a0ef32092c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.81",
       "ip6": "fe80::2e0:81ff:fed5:724",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:24",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-81.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/8",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:25",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:26",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a9",
       "interface": "InfiniBand",
       "ip": "172.18.64.81",
-      "ip6": "fe80::202:c903:b:93a9",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-81-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce88",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
index ed3c4344948eb67cba59e25fc088d15886c17fc6..758d82da36f435c0290769596741b5178fe841f4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.82",
       "ip6": "fe80::2e0:81ff:fed5:7b4",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:b4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-82.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/7",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:b5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:b6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:95",
       "interface": "InfiniBand",
       "ip": "172.18.64.82",
-      "ip6": "fe80::202:c903:b:9395",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-82-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce18",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
index c0030f84aad24996588e9dbca48bcb3408aab660..5225712aaf8f301238fb0abaa2637b570bf4968a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.84",
       "ip6": "fe80::2e0:81ff:fed5:718",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:18",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-84.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/9",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:19",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:1a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d",
       "interface": "InfiniBand",
       "ip": "172.18.64.84",
-      "ip6": "fe80::202:c903:b:939d",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-84-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e9021d",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
index e2c40a7bee43512d84b942c0a35218a14a35f868..11ff6d75702083ee39810b00f2b384deff47d843 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.85",
       "ip6": "fe80::2e0:81ff:fed5:7ec",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:ec",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-85.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/12",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:ed",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:ee",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -107,12 +117,13 @@
       "ip6": "fe80::202:c903:b:9399",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-85-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +134,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b13",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
index 125a698330d30dd3dfb7bfc3c093ca2816149900..f974d61cde552eb08b379db73f63efd64f1e1f75 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.87",
       "ip6": "fe80::2e0:81ff:fed5:758",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:58",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-87.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/14",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:59",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:5a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ad",
       "interface": "InfiniBand",
       "ip": "172.18.64.87",
-      "ip6": "fe80::202:c903:b:93ad",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-87-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce12",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
index 8a65783f2f4e22d2845b856e2b4bae435a1a59ea..6381baf281aa072005b10b64ac6ea1c45fe1822d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.88",
       "ip6": "fe80::2e0:81ff:fed5:860",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:60",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-88.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/13",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:61",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:62",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b1",
       "interface": "InfiniBand",
       "ip": "172.18.64.88",
-      "ip6": "fe80::202:c903:b:93b1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-88-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cdfd",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
index b0b75c459bf52b3be497984727dcbc8ac047e874..3a3d53a2bda5e34d5eece62654155803cc2f7c83 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.89",
       "ip6": "fe80::2e0:81ff:fed5:898",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:98",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-89.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/16",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:99",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:9a",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ed",
       "interface": "InfiniBand",
       "ip": "172.18.64.89",
-      "ip6": "fe80::202:c903:b:5ced",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-89-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cdcf",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
index a2041f2357ea8f23dee92bce539fccdc6bdb874c..9dc560291239c7c851fc358b219250b3650906cb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.9",
       "ip6": "fe80::2e0:81ff:fed5:884",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:84",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-9.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene1",
       "switch_port": "GigabitEthernet1/0/11",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:85",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:86",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:69",
       "interface": "InfiniBand",
       "ip": "172.18.64.9",
-      "ip6": "fe80::202:c903:b:9169",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-9-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6bf36",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
index 7c874aebee5f45391de59b6b382058a061620ab4..206af4d9f6717d7d479f0c0e2bb2e6eeff0d1ba5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.90",
       "ip6": "fe80::2e0:81ff:fed5:664",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:64",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-90.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/15",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:65",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:66",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:09",
       "interface": "InfiniBand",
       "ip": "172.18.64.90",
-      "ip6": "fe80::202:c903:b:5d09",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-90-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce40",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
index 6dc9656b9e1b3c16a2ffaa614023c9774ce331d3..2949ac761312ed550a42115172cdcdb9eb836f14 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.91",
       "ip6": "fe80::2e0:81ff:fed5:6dc",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:dc",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-91.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/18",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:dd",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:de",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d1",
       "interface": "InfiniBand",
       "ip": "172.18.64.91",
-      "ip6": "fe80::202:c903:b:5cd1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-91-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce49",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
index 732876e40aafb75b7d3216c22c691ca1396d0922..24a9a92c2c0603f88d958d1eab56731d5f298908 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.92",
       "ip6": "fe80::2e0:81ff:fed5:7a4",
       "kavlan": true,
       "mac": "00:e0:81:d5:07:a4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-92.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/17",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:a5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:07:a6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e5",
       "interface": "InfiniBand",
       "ip": "172.18.64.92",
-      "ip6": "fe80::202:c903:b:5ce5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-92-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b32",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
index 414ee2892ba5dbb2187c6a383e5df32e26485c91..d5454879aed62d8b4dd248060cd73f4604cdc95d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.93",
       "ip6": "fe80::2e0:81ff:fed5:64c",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:4c",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-93.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/20",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:4d",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:4e",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ad",
       "interface": "InfiniBand",
       "ip": "172.18.64.93",
-      "ip6": "fe80::202:c903:b:5ead",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-93-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fffd",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
index 23c22a14644296c6703295885a3864515ae2c693..fc891909633da59bf00009f73a09aef9bf983421 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.95",
       "ip6": "fe80::2e0:81ff:fed5:6c0",
       "kavlan": true,
       "mac": "00:e0:81:d5:06:c0",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-95.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/22",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:c1",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:06:c2",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -107,12 +117,13 @@
       "ip6": "fe80::202:c903:b:5e95",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-95-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +134,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6855b",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
index 3f05c12312918b16b282c5123779d08d2545b62c..bc4f9899f351c62b63a50f7fd2274bc09123d37e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.97",
       "ip6": "fe80::2e0:81ff:fed5:800",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:00",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-97.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/24",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:01",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:02",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -104,15 +114,15 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d5",
       "interface": "InfiniBand",
       "ip": "172.18.64.97",
-      "ip6": "fe80::202:c903:b:5ed5",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-97-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +133,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +210,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fc48",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
index 0c6e6436dc697ff1e56c09cd5dc3cc5d1e45e060..cc43702023928fbd461f362b39fd38b027bd6d6c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
@@ -53,19 +53,22 @@
       "device": "eth0",
       "driver": "e1000e",
       "enabled": true,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "ip": "172.16.64.99",
       "ip6": "fe80::2e0:81ff:fed5:8d4",
       "kavlan": true,
       "mac": "00:e0:81:d5:08:d4",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
+      "name": "enp3s0",
       "network_address": "graphene-99.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgraphene3",
       "switch_port": "GigabitEthernet1/0/26",
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -73,14 +76,17 @@
       "device": "eth1",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:d5",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
+      "name": "enp4s0",
       "rate": 100000000,
-      "vendor": "intel",
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -88,13 +94,17 @@
       "device": "eth2",
       "driver": "e1000e",
       "enabled": false,
+      "firmware_version": "1.8-0",
       "interface": "Ethernet",
       "kavlan": false,
       "mac": "00:e0:81:d5:08:d6",
       "management": false,
+      "model": "82574L Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "vendor": "intel",
+      "name": "enp5s0",
+      "rate": 0,
+      "vendor": "Intel",
       "version": "82574L"
     },
     {
@@ -107,12 +117,13 @@
       "ip6": "fe80::202:c903:b:5eb1",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-99-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgrapheneib",
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -123,10 +134,11 @@
       "interface": "InfiniBand",
       "kavlan": false,
       "management": false,
+      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "vendor": "Mellanox",
+      "vendor": "Mellanox Technologies",
       "version": "MT26418"
     },
     {
@@ -199,9 +211,9 @@
       "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce36",
       "device": "sda",
       "driver": "ahci",
+      "firmware_version": "JPFOA3EA",
       "interface": "SATA II",
       "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
       "size": 320072933376,
       "storage": "HDD",
       "vendor": "Hitachi"
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
index 7097d37ad4746ebfe5dd94c9786b9ebfc6763195..a9518a8a1f3207e9cdea0553d02eae248c7015f4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
@@ -22,38 +22,52 @@ graphene-10:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.10
       mac: 00:e0:81:d5:06:d0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:d1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:d2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6d
       interface: InfiniBand
       ip: 172.18.64.10
-      ip6: fe80::202:c903:b:916d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-10:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e2a7ff"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
index cf48da97d4fcc825a3ce21157240a9a8449e9619..27892139d7aae8b52f88ab806a670ce8514615f9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
@@ -22,38 +22,52 @@ graphene-100:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.100
       mac: 00:e0:81:d5:07:cc
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:cd
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:ce
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0d
       interface: InfiniBand
       ip: 172.18.64.100
-      ip6: fe80::202:c903:b:5d0d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-100:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cd4d"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
index 8da9d6743c693b8018f02575035ba3807c639fe2..585dfeb079f787e78e40d8868dcc7092f92350d0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
@@ -22,38 +22,52 @@ graphene-101:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.101
       mac: 00:e0:81:d5:06:a0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:a1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:a2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d9
       interface: InfiniBand
       ip: 172.18.64.101
-      ip6: fe80::202:c903:b:5cd9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:da
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-101:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93b81"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
index e11e4fe2ba505153d91728cb0957734da9c5c6dd..cad8ed7c77f81db0bdbaf9a643a5c5da0b4a37a0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
@@ -22,38 +22,52 @@ graphene-103:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.103
       mac: 00:e0:81:d5:08:c8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:c9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:ca
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:49
       interface: InfiniBand
       ip: 172.18.64.103
-      ip6: fe80::202:c903:b:5d49
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:4a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-103:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93a91"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
index 7e092b4e8166146d136e3c7e8582c550ed94039b..ac682041529b9d3a60ca31cd179ebed351194875 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
@@ -22,38 +22,52 @@ graphene-104:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.104
       mac: 00:e0:81:d5:07:64
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:65
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:66
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:15
       interface: InfiniBand
       ip: 172.18.64.104
-      ip6: fe80::202:c903:b:5d15
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:16
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-104:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69fb9"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
index 180260e83e5067667c1ec30830c9c25b5be4fee8..e9666bda248f2cca89ed6a3a82363103e42eeb1e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
@@ -22,38 +22,52 @@ graphene-105:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.105
       mac: 00:e0:81:d5:06:bc
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:bd
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:be
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:19
       interface: InfiniBand
       ip: 172.18.64.105
-      ip6: fe80::202:c903:b:5d19
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:1a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-105:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e70d39"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
index 626d6d9706233d2cb56c6c2ccf70e481f3a33f0a..0a1778aff66f21fb4a00aa13da93f13290c48788 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
@@ -22,38 +22,52 @@ graphene-106:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.106
       mac: 00:e0:81:d5:07:f4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:f5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:f6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ad
       interface: InfiniBand
       ip: 172.18.64.106
-      ip6: fe80::202:c903:b:5cad
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ae
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-106:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69f32"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
index 4542833a4337cdc165603c5126686a928296219f..058409e89faa1f345fdbcc66527ea0fc347a0b20 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
@@ -22,38 +22,52 @@ graphene-107:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.107
       mac: 00:e0:81:d5:07:c8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:c9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:ca
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3d
       interface: InfiniBand
       ip: 172.18.64.107
-      ip6: fe80::202:c903:b:5d3d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-107:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93b4b"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
index ccd8deb3a948a43c78434b777e02c0cf12134457..42a4a9890b65e393d5cd279625f46449e508e4ea 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
@@ -22,38 +22,52 @@ graphene-108:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.108
       mac: 00:e0:81:d5:07:14
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:15
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:16
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:21
       interface: InfiniBand
       ip: 172.18.64.108
-      ip6: fe80::202:c903:b:5d21
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:22
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-108:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93b53"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
index df1909fa9c0077a85766296fab98157e610b60b6..9dd549e27db7f5c5995fe5f277ab050708dffed8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
@@ -22,38 +22,52 @@ graphene-109:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.109
       mac: 00:e0:81:d5:08:30
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:31
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:32
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:25
       interface: InfiniBand
       ip: 172.18.64.109
-      ip6: fe80::202:c903:b:5d25
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:26
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-109:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fc8e"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
index 8ab2856c3df8068ef5216d7b8a58d99a33ef3389..833ed45362ebc801aac19885ae35f77464e34555 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
@@ -22,38 +22,52 @@ graphene-11:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.11
       mac: 00:e0:81:d5:08:7c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:7d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:7e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:71
       interface: InfiniBand
       ip: 172.18.64.11
-      ip6: fe80::202:c903:b:9171
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:72
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-11:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e5f35c"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
index 3db80c01aa3dfd3025c5b97561b04ac97394aca0..838a83f66a52ee51f72324927a43ef302d2ea585 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
@@ -22,38 +22,52 @@ graphene-110:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.110
       mac: 00:e0:81:d5:07:6c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:6d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:6e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:a9
       interface: InfiniBand
       ip: 172.18.64.110
-      ip6: fe80::202:c903:b:5ca9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:aa
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-110:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93a8c"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
index 13402eecfedb3eb119b46667eaa497fbe67e73ac..ad4a50e64422884973bf30663dcd3906e9fcb95d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
@@ -22,38 +22,52 @@ graphene-111:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.111
       mac: 00:e0:81:d5:08:58
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:59
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:5a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:91
       interface: InfiniBand
       ip: 172.18.64.111
-      ip6: fe80::202:c903:c:5591
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:92
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-111:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e901fe"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
index 5ab5c18ebc7523092961eb3bb3750721fced46f4..da3a66d366aa63c54dceb29f7e99f446fce83e15 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
@@ -22,38 +22,52 @@ graphene-112:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.112
       mac: 00:e0:81:d5:08:10
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:11
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:12
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9d
       interface: InfiniBand
       ip: 172.18.64.112
-      ip6: fe80::202:c903:b:7e9d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-112:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ed3"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
index 70eea661cfe2fac41e9da867e6affbf5aa7e1632..91466cf4178b8a5a3cfcc081bf16a5bd95a30744 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
@@ -22,38 +22,52 @@ graphene-113:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.113
       mac: 00:e0:81:d5:07:bc
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:bd
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:be
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b5
       interface: InfiniBand
       ip: 172.18.64.113
-      ip6: fe80::202:c903:b:93b5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-113:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93ac0"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
index 5cf90422529ce2978fc8af4ba7975bc3aba743ca..06bf87d4bc400e027e39252c0378f2580d6ddd9a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
@@ -22,38 +22,52 @@ graphene-114:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.114
       mac: 00:e0:81:d5:06:b0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:b1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:b2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c5
       interface: InfiniBand
       ip: 172.18.64.114
-      ip6: fe80::202:c903:b:93c5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-114:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ece"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
index 6c3375a142cb3ecb8881b85eba64716dfc46ad63..1477a30d35cfccb74f97b954eb29d0e227c1c7e9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
@@ -22,38 +22,52 @@ graphene-115:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.115
       mac: 00:e0:81:d5:08:04
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:05
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:06
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:05
       interface: InfiniBand
       ip: 172.18.64.115
-      ip6: fe80::202:c903:b:9305
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:06
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-115:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fcf0"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
index 50499b3080c6c40721d2f2d0cdb4ff9c6de72e40..50adfac2389c7665faddfe3667a5d6e74dfc51fd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
@@ -22,38 +22,52 @@ graphene-116:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.116
       mac: 00:e0:81:d5:08:28
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:29
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:2a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1d
       interface: InfiniBand
       ip: 172.18.64.116
-      ip6: fe80::202:c903:b:931d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-116:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93aa5"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
index ecce4cb0dbc25585b2dc7fc1267b804de9fe206b..966e538f04b651a05aab263e6233a5f4d482ac45 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
@@ -22,38 +22,52 @@ graphene-117:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.117
       mac: 00:e0:81:d5:06:e4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:e5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:e6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:25
       interface: InfiniBand
       ip: 172.18.64.117
-      ip6: fe80::202:c903:b:9325
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:26
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-117:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93ac2"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
index bd06a9bae9b1ff06417b1cdba92eb1ad6b60d557..79d6e46ce1459e16fff7b05811cb49b92ec044a2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
@@ -22,38 +22,52 @@ graphene-118:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.118
       mac: 00:e0:81:d5:07:b8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:b9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:ba
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d9
       interface: InfiniBand
       ip: 172.18.64.118
-      ip6: fe80::202:c903:b:92d9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:da
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-118:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e98452"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
index a491aee1c0e015f06ce6689a52cab97a868d088d..2206a8636e8454f36f96be9a61f2cfd60f21664b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
@@ -22,38 +22,52 @@ graphene-119:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.119
       mac: 00:e0:81:d5:06:f0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:f1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:f2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:19
       interface: InfiniBand
       ip: 172.18.64.119
-      ip6: fe80::202:c903:b:9319
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-119:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93ac9"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
index e77ac30f9cafb94f40cd9319bcb97f8836b760ae..1327e0aee3b82dcdb7ccf9b7f5f9f8ad48784b26 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
@@ -22,38 +22,52 @@ graphene-12:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.12
       mac: 00:e0:81:d5:07:8c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:8d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:8e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:81
       interface: InfiniBand
       ip: 172.18.64.12
-      ip6: fe80::202:c903:b:9381
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:82
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-12:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371df3bd5"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
index b2e544110675ea91fe3e790c48d1871f5e9d2a93..0b0e5340f4b27a8b12df6542b240792810bac245 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
@@ -22,38 +22,52 @@ graphene-120:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.120
       mac: 00:e0:81:d5:08:ac
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:ad
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:ae
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:29
       interface: InfiniBand
       ip: 172.18.64.120
-      ip6: fe80::202:c903:b:9329
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-120:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69f52"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
index 55f642e44d6fe90e212440f8260d8d4aa91834b1..3d37100c6c2950a2daa086281b16eb45bbc3528b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
@@ -22,38 +22,52 @@ graphene-121:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.121
       mac: 00:e0:81:d5:07:38
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:39
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:3a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2d
       interface: InfiniBand
       ip: 172.18.64.121
-      ip6: fe80::202:c903:b:932d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-121:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cd7b"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
index 9915551a6d4bb09cba1e390b58d54319786b7524..09315364bbd2985ebba0382ec39dc730f75db486 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
@@ -22,38 +22,52 @@ graphene-122:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.122
       mac: 00:e0:81:d5:08:38
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:39
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:3a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:85
       interface: InfiniBand
       ip: 172.18.64.122
-      ip6: fe80::202:c903:b:5d85
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:86
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-122:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60ba2"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
index 3a886112b388c68c8e4cbc924a39a2f11d1f86a4..615cb9826737b185cec96dfc9d6b463b5c212876 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
@@ -22,38 +22,52 @@ graphene-124:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.124
       mac: 00:e0:81:d5:06:a4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:a5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:a6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61
       interface: InfiniBand
       ip: 172.18.64.124
-      ip6: fe80::202:c903:2:7f61
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:62
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-124:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e669a0"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
index 4278db6d598ab0afeba663538b83951adb9547f8..5557427ed7e28a09f4bb97626a60e67cf1c28e0e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
@@ -22,38 +22,52 @@ graphene-125:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.125
       mac: 00:e0:81:d5:08:68
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:69
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:6a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:91
       interface: InfiniBand
       ip: 172.18.64.125
-      ip6: fe80::202:c903:b:9391
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:92
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-125:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe1f"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
index cdb10681e83551c489e25de2014073b9ce5dc1ae..e5a2d29bbe393c02685d3fd506845a47a3cdb88b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
@@ -22,38 +22,52 @@ graphene-127:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.127
       mac: 00:e0:81:d5:08:40
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:41
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:42
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:85
       interface: InfiniBand
       ip: 172.18.64.127
-      ip6: fe80::202:c903:b:9285
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:86
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-127:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe0f"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
index ec795655dc1c1c4d7bab15eb9b1a82535d2cae6b..89015b3cf8cdf33595e2101a4db3551b1608fd4c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
@@ -22,38 +22,52 @@ graphene-128:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.128
       mac: 00:e0:81:d5:08:e4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:e5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:e6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:15
       interface: InfiniBand
       ip: 172.18.64.128
-      ip6: fe80::202:c903:b:9215
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:16
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-128:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e901ec"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
index a372d945e7f7d1d83a7c0e9397ec9943f262274a..25b729593b03bf27c884c8ba759bf9d46a990c11 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
@@ -22,38 +22,52 @@ graphene-129:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.129
       mac: 00:e0:81:d5:07:1c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:1d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:1e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:05
       interface: InfiniBand
       ip: 172.18.64.129
-      ip6: fe80::202:c903:b:9205
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:06
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-129:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cd7c"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
index 66b4daa0bb9c05b33c3f6163bdbb87e7744a3023..a768669d73686d9324efb71af9db8e7e18c98fa8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
@@ -22,38 +22,52 @@ graphene-13:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.13
       mac: 00:e0:81:d5:06:fc
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:fd
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:fe
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:85
       interface: InfiniBand
       ip: 172.18.64.13
-      ip6: fe80::202:c903:b:9385
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:86
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-13:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e2ae6c"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
index 3828a4317677832f5b534df21f9283469781cb16..5d0503fcede2d52934f8cf976420bbecd71433a0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
@@ -22,38 +22,52 @@ graphene-130:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.130
       mac: 00:e0:81:d2:5a:34
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d2:5a:35
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d2:5a:36
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:09
       interface: InfiniBand
       ip: 172.18.64.130
-      ip6: fe80::202:c903:b:9209
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-130:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e901df"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
index db6da3222c2b921e7259eb911b94e5bdd1fe4a8d..f2a1ec8d8910942b67722c7d3497f02157ff4c40 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
@@ -22,38 +22,52 @@ graphene-131:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.131
       mac: 00:e0:81:d5:06:f8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:f9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:fa
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d
       interface: InfiniBand
       ip: 172.18.64.131
-      ip6: fe80::202:c903:b:914d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-131:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e722b5"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
index 4521375e1b88de34f5e7ad93b329015d00a9f4b2..948b4698d93ccd9ec62d4304889f4d1747b209ec 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
@@ -22,38 +22,52 @@ graphene-132:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.132
       mac: 00:e0:81:d5:08:8c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:8d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:8e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0d
       interface: InfiniBand
       ip: 172.18.64.132
-      ip6: fe80::202:c903:b:920d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-132:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6a3a3"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
index b94bb5e287cad18536d487e464586dc0cc00d2a4..d3378d730b845021d159734ddb22db52df5fa50b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
@@ -22,38 +22,52 @@ graphene-133:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.133
       mac: 00:e0:81:d5:07:e0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:e1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:e2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b3
       interface: InfiniBand
       ip: 172.18.64.133
-      ip6: fe80::202:c903:5:f7b3
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b4
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-133:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60bd7"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
index 4e95e70c1bf189ccfaf8e51b2bc20205b3a87737..bcc9c81c9b722d97a3e3e8510098b2a369eea3b1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
@@ -22,38 +22,52 @@ graphene-134:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.134
       mac: 00:e0:81:d5:08:e8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:e9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:ea
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:4f
       interface: InfiniBand
       ip: 172.18.64.134
-      ip6: fe80::202:c903:5:f44f
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:50
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-134:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ffe9"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
index 61ad55f83a1a0117224c0f731db80f5d1a5fcf27..51e5e5cb98ffbd23c0c4c45270195bce6864a2fc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
@@ -22,38 +22,52 @@ graphene-135:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.135
       mac: 00:e0:81:d5:06:70
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:71
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:72
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c7
       interface: InfiniBand
       ip: 172.18.64.135
-      ip6: fe80::202:c903:5:f4c7
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c8
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-135:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e98413"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
index e7366ea6f29e61383cd81d0f9cbca34f86e0ab1b..d7c97e267363a35a96455541e98061f1719700b3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
@@ -22,38 +22,52 @@ graphene-136:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.136
       mac: 00:e0:81:d5:07:7c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:7d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:7e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:47
       interface: InfiniBand
       ip: 172.18.64.136
-      ip6: fe80::202:c903:5:f847
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:48
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-136:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e90000"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
index fce7cfd6b1f95f1a491b99805454c3e948dd1ca2..bbc935bec6baf076de0b26929dcb4a7265f6695a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
@@ -22,38 +22,52 @@ graphene-137:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.137
       mac: 00:e0:81:d5:08:44
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:45
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:46
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:47
       interface: InfiniBand
       ip: 172.18.64.137
-      ip6: fe80::202:c903:5:f647
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:48
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-137:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e95045"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
index cf32ce01f2a80babf9368831cdc9cb0e84eb43aa..300a2e8cb1647eade83b2bf9e860c10a75be96e8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
@@ -22,38 +22,52 @@ graphene-138:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.138
       mac: 00:e0:81:d5:08:c4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:c5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:c6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c3
       interface: InfiniBand
       ip: 172.18.64.138
-      ip6: fe80::202:c903:5:f4c3
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c4
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-138:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fdf6"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
index 1a3d3978bbf98a65d07682bdb5e241f9f876e1b8..f90dad3167d9ee532e98e89df1a8bb4458488569 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
@@ -22,38 +22,52 @@ graphene-139:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.139
       mac: 00:e0:81:d5:07:80
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:81
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:82
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:ff
       interface: InfiniBand
       ip: 172.18.64.139
-      ip6: fe80::202:c903:5:f7ff
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:00
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-139:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe04"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
index 8ed222267e6aa2d13e2ab38acb8cc7eec9d7d3b6..cd61693833b8e40be2024861115d3155d18e07ac 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
@@ -22,38 +22,52 @@ graphene-14:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.14
       mac: 00:e0:81:d5:06:d4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:d5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:d6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e1
       interface: InfiniBand
       ip: 172.18.64.14
-      ip6: fe80::202:c903:b:93e1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-14:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371dfa661"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
index cfcfd6321bd2fd4733b6e80656b81abec361db80..4e4d4e7b27e31f1b6216ab86e916bd96f01bacbe 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
@@ -22,38 +22,52 @@ graphene-140:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.140
       mac: 00:e0:81:d5:07:78
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:79
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:7a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:9f
       interface: InfiniBand
       ip: 172.18.64.140
-      ip6: fe80::202:c903:5:f79f
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a0
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-140:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cdbb"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
index 64dda3565a8428af4715dc1b06d8e0a8226653d5..efdc30e44e5d688a5ecfbbf46a0017379bd90148 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
@@ -22,38 +22,52 @@ graphene-142:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.142
       mac: 00:e0:81:d5:06:8c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:8d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:8e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a7
       interface: InfiniBand
       ip: 172.18.64.142
-      ip6: fe80::202:c903:5:f7a7
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a8
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-142:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60c3a"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
index 14d89895d061e84c4bab5d92697e2d9da67c9f40..2635746d2b70a7bb1795a1a9a9cdab6a35fce0a0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
@@ -22,38 +22,52 @@ graphene-143:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.143
       mac: 00:e0:81:d5:07:94
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:95
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:96
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:97
       interface: InfiniBand
       ip: 172.18.64.143
-      ip6: fe80::202:c903:5:f497
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:98
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-143:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fcbd"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
index 1519b6746fe92038c39ebcca78c5e79738775471..b8a3f67cac7469cab62b5ee5cc03e636cf2165b3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
@@ -22,38 +22,52 @@ graphene-15:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.15
       mac: 00:e0:81:d5:07:e8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:e9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:ea
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c9
       interface: InfiniBand
       ip: 172.18.64.15
-      ip6: fe80::202:c903:b:93c9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ca
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-15:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e68f5e"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
index 5e60e7f3e0f0590a1ba6678532f73f4c43d3dc83..c55553bb4e5a2ca9d34663794fa39392e5d0b95f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
@@ -22,38 +22,52 @@ graphene-16:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.16
       mac: 00:e0:81:d5:07:c0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:c1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:c2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:75
       interface: InfiniBand
       ip: 172.18.64.16
-      ip6: fe80::202:c903:b:9375
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:76
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-16:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e75540"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
index b80fda7cb7d519a56c2f601724e5c94f09327b49..0da9105647806d471dd880c5a8349139204ccdbf 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
@@ -22,38 +22,52 @@ graphene-17:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.17
       mac: 00:e0:81:d5:08:a8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:a9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:aa
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:71
       interface: InfiniBand
       ip: 172.18.64.17
-      ip6: fe80::202:c903:b:9371
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:72
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-17:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371df3aa3"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
index 86c9369c403172177a7b1e259bd37e4db8fcf59e..51dde17c793ae8b6279930c83ec3c3e66486d3a3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
@@ -22,38 +22,52 @@ graphene-18:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.18
       mac: 00:e0:81:d5:08:3c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:3d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:3e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7d
       interface: InfiniBand
       ip: 172.18.64.18
-      ip6: fe80::202:c903:b:937d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-18:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e70ca5"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
index 86c561e68b1d5854ae14aa065f2cd73b079f3b87..20cfbea5e956374ac4e595fb96db6ebf42456e40 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
@@ -22,38 +22,52 @@ graphene-19:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.19
       mac: 00:e0:81:d5:08:b4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:b5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:b6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:55
       interface: InfiniBand
       ip: 172.18.64.19
-      ip6: fe80::202:c903:b:9155
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:56
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-19:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371dfa662"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
index d71ce477e1000b210736607db9f3812a161c5806..743532146d939dccac0ee67c60628b6fc634e036 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
@@ -22,38 +22,52 @@ graphene-2:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.2
       mac: 00:e0:81:d5:07:70
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:71
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:72
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5d
       interface: InfiniBand
       ip: 172.18.64.2
-      ip6: fe80::202:c903:b:915d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-2:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6fd31"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
index 7fb5f39915f43e31a4b1f87f4b9a71f584ad8084..738256176a7e0b2c131b35d936918512e0aa3990 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
@@ -22,38 +22,52 @@ graphene-20:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.20
       mac: 00:e0:81:d5:07:68
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:69
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:6a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:45
       interface: InfiniBand
       ip: 172.18.64.20
-      ip6: fe80::202:c903:b:9145
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:46
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-20:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e73c2d"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
index 4d63ac6d5cd97a77699abca6c4418c768b311af3..bae55c037208ce1dd27e9178bbe19f191afc0ec4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
@@ -22,38 +22,52 @@ graphene-21:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.21
       mac: 00:e0:81:d2:59:f8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d2:59:f9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d2:59:fa
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6d
       interface: InfiniBand
       ip: 172.18.64.21
-      ip6: fe80::202:c903:4:536d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-21:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe4f"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
index 4dbd6af20679dbe47c9cce0f14e3b525f0bf9c5c..5c8dc9e92a59cff10c9b3ff4869168d5fdfa3f27 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
@@ -22,38 +22,52 @@ graphene-22:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.22
       mac: 00:e0:81:d5:07:d8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:d9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:da
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:79
       interface: InfiniBand
       ip: 172.18.64.22
-      ip6: fe80::202:c903:b:9379
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-22:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ef4"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
index ccfa5c4c78f80a3b72515be9e15a1d7c1051603a..c0d2b2a89f01f51c1a6f35956f5ba3417385a4cd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
@@ -22,38 +22,52 @@ graphene-23:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.23
       mac: 00:e0:81:d5:06:c4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:c5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:c6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:65
       interface: InfiniBand
       ip: 172.18.64.23
-      ip6: fe80::202:c903:b:9365
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:66
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-23:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e901f8"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
index 71f5d8a36a75e90e5bad987066aee52bef36a6b2..56f2ccd2225054590dd423222516318409abc0d0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
@@ -22,38 +22,52 @@ graphene-24:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.24
       mac: 00:e0:81:d5:07:10
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:11
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:12
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:cd
       interface: InfiniBand
       ip: 172.18.64.24
-      ip6: fe80::202:c903:b:92cd
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ce
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-24:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6a448"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
index 0a3e83c6f88490fe25cca5f834ae9a060751116a..a1e3dbc45e14b072cc0302ea6de2898e9ed4f370 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
@@ -22,38 +22,52 @@ graphene-25:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.25
       mac: 00:e0:81:d5:07:50
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:51
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:52
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a5
       interface: InfiniBand
       ip: 172.18.64.25
-      ip6: fe80::202:c903:b:92a5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-25:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69f03"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
index cd8626f5e1ee4b80fe622d7ec2fc7cc90e24c25d..87a0115b5bcf6036c2562227a9547c15278c0f41 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
@@ -22,38 +22,52 @@ graphene-27:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.27
       mac: 00:e0:81:d5:07:5c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:5d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:5e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:89
       interface: InfiniBand
       ip: 172.18.64.27
-      ip6: fe80::202:c903:b:9289
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-27:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce39"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
index 04e91ab5525269e0bc749c4f4fe858d09ccf8cd2..21535ecee8c07c2515655cf75281fdf58391e206 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
@@ -22,38 +22,52 @@ graphene-29:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.29
       mac: 00:e0:81:d5:06:54
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:55
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:56
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:dd
       interface: InfiniBand
       ip: 172.18.64.29
-      ip6: fe80::202:c903:b:90dd
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:de
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-29:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce23"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
index d3b07db807989c2a488c2aca2fe31e7a958d5dca..e476c63867a374d870fc20a25facf0d2e6e0f587 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
@@ -22,38 +22,52 @@ graphene-30:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.30
       mac: 00:e0:81:d5:08:ec
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:ed
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:ee
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:79
       interface: InfiniBand
       ip: 172.18.64.30
-      ip6: fe80::202:c903:b:9279
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-30:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce27"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
index cad4a9205a37bd6c499c0a9e8dedd6d5f7d12ae5..5ab02c05f74696c8aa59203cc252bac40dc4e3a4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
@@ -22,38 +22,52 @@ graphene-31:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.31
       mac: 00:e0:81:d5:06:60
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:61
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:62
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1d
       interface: InfiniBand
       ip: 172.18.64.31
-      ip6: fe80::202:c903:b:921d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-31:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ee5"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
index 468384c5ec15dbf67c2f57fa7821b734eac60170..ac38e7747e17ac4e9faf2879221b7fea074f5f59 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
@@ -22,38 +22,52 @@ graphene-32:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.32
       mac: 00:e0:81:d5:06:c8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:c9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:ca
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7d
       interface: InfiniBand
       ip: 172.18.64.32
-      ip6: fe80::202:c903:b:927d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-32:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69efc"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
index 62c78627e6aeefa5e6d812af45bee329eb6823d3..3f159ebd92b172ce9bc711d13a01d683e96efd5e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
@@ -22,38 +22,52 @@ graphene-33:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.33
       mac: 00:e0:81:d5:06:6c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:6d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:6e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:d9
       interface: InfiniBand
       ip: 172.18.64.33
-      ip6: fe80::202:c903:b:90d9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:da
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-33:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ecf"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
index 414011bd0d0c29e7eabb0205c92aafe3ab68633c..e8f4885e1d9f1cf01b2afc46c3aeb388b2bfc7a5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
@@ -22,38 +22,52 @@ graphene-34:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.34
       mac: 00:e0:81:d5:08:9c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:9d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:9e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:65
       interface: InfiniBand
       ip: 172.18.64.34
-      ip6: fe80::202:c903:b:9165
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:66
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-34:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e902da"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
index 83ced752bb7f88b64522194afd78c7727cc6d7d6..006d6219a20afe545d4f51caccd847537ec07e59 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
@@ -22,38 +22,52 @@ graphene-35:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.35
       mac: 00:e0:81:d5:08:1c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:1d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:1e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:ef
       interface: InfiniBand
       ip: 172.18.64.35
-      ip6: fe80::202:c903:1:d5ef
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:f0
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-35:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e90217"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
index 277cd43ed86965b70939b5ef53b6066076752fcd..60cab5de200f624c2b01514943820e267081f5c2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
@@ -22,38 +22,52 @@ graphene-37:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.37
       mac: 00:e0:81:d5:08:a4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:a5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:a6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c5
       interface: InfiniBand
       ip: 172.18.64.37
-      ip6: fe80::202:c903:b:92c5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-37:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e901e5"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
index 42c5ec3ec028b76bebd410c103bbdd0100dae05a..f3d88f34292c35eb3141a2260001cb184c54d7a4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
@@ -22,38 +22,52 @@ graphene-38:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.38
       mac: 00:e0:81:d5:07:30
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:31
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:32
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b1
       interface: InfiniBand
       ip: 172.18.64.38
-      ip6: fe80::202:c903:b:92b1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-38:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e901e9"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
index 1e29fcacb7bc5f882253b07d1d9d70300cb43d41..23ee1dcee7b8176e08ff3a090d2b47242a30d1a1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
@@ -22,38 +22,52 @@ graphene-4:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.4
       mac: 00:e0:81:d5:08:54
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:55
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:56
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd
       interface: InfiniBand
       ip: 172.18.64.4
-      ip6: fe80::202:c903:b:92bd
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-4:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b9b"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
index 38450f55e5956fcbb77186784a63d6ec87116f1a..2e27539639a18c0adb24f95c89431ddfa563e697 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
@@ -22,38 +22,52 @@ graphene-41:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.41
       mac: 00:e0:81:d5:07:ac
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:ad
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:ae
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:99
       interface: InfiniBand
       ip: 172.18.64.41
-      ip6: fe80::202:c903:b:9299
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-41:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe3b"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
index 08cffe467880cccf305fadc042833f9819e56a09..11078d2cb211a0a5d426a8726377e700f733f6b1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
@@ -22,38 +22,52 @@ graphene-42:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.42
       mac: 00:e0:81:d5:07:88
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:89
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:8a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a9
       interface: InfiniBand
       ip: 172.18.64.42
-      ip6: fe80::202:c903:b:92a9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:aa
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-42:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6d13d"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
index c240fee16819ebca4443fd95363a4bdac00f6676..e32e9f0ada0bcaed6035ea1e417137ef00127d7f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
@@ -22,38 +22,52 @@ graphene-43:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.43
       mac: 00:e0:81:d5:08:24
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:25
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:26
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ad
       interface: InfiniBand
       ip: 172.18.64.43
-      ip6: fe80::202:c903:b:92ad
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ae
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-43:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e93c32"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
index a67513fb4a9d741b053b3cf73f444316480b9132..d1185f1e88ee294a74bd5635d397e2fcfbc7bc78 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
@@ -22,38 +22,52 @@ graphene-44:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.44
       mac: 00:e0:81:d5:06:e0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:e1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:e2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b5
       interface: InfiniBand
       ip: 172.18.64.44
-      ip6: fe80::202:c903:b:92b5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-44:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6a746"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
index be89664cfb90bd178c25da5244ac8f07c563725b..dce80d88f2b493fcbc8fb66154ea13bc5cc54052 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
@@ -22,38 +22,52 @@ graphene-45:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.45
       mac: 00:e0:81:d5:06:5c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:5d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:5e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:21
       interface: InfiniBand
       ip: 172.18.64.45
-      ip6: fe80::202:c903:b:9321
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:22
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-45:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca34de8f88e"
+      firmware_version: GM3OA5CA
       model: Hitachi HDP72503
-      rev: GM3OA5CA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
index d2253438f9e3fdfe55cc35b2efcf473eec63fcf4..aec17abbc69518ed73fccd83e293c5505030d677 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
@@ -22,38 +22,52 @@ graphene-46:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.46
       mac: 00:e0:81:d5:06:94
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:95
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:96
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d5
       interface: InfiniBand
       ip: 172.18.64.46
-      ip6: fe80::202:c903:b:93d5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-46:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e90220"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
index 9cb4e0f36064bd6207890f927c6926825c039255..6170df85f2533cde146220f3005dab82c4e94ca6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
@@ -22,38 +22,52 @@ graphene-47:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.47
       mac: 00:e0:81:d5:08:94
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:95
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:96
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e5
       interface: InfiniBand
       ip: 172.18.64.47
-      ip6: fe80::202:c903:b:93e5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-47:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe33"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
index aa0ff6e56d1ddc848fad6e17c30b963c55f2135c..a5b4771734a1fd4663c8a098713934c49bd0f4d9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
@@ -22,38 +22,52 @@ graphene-48:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.48
       mac: 00:e0:81:d5:06:e8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:e9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:ea
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:dd
       interface: InfiniBand
       ip: 172.18.64.48
-      ip6: fe80::202:c903:b:93dd
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:de
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-48:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cee9"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
index bf44b8327426c5a68b4ccc95c30314ec197d0378..d37f79bff00cab25a7f711c20a53261c5e268030 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
@@ -22,38 +22,52 @@ graphene-49:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.49
       mac: 00:e0:81:d5:08:5c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:5d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:5e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d1
       interface: InfiniBand
       ip: 172.18.64.49
-      ip6: fe80::202:c903:b:93d1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-49:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6d249"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
index 21fee28325d2124920117f54c25ff58758988a0a..008fe7774fd7d06270edfa8bb923bb22e2c93ffb 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
@@ -22,38 +22,52 @@ graphene-5:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.5
       mac: 00:e0:81:d5:08:b8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:b9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:ba
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:79
       interface: InfiniBand
       ip: 172.18.64.5
-      ip6: fe80::202:c903:b:9179
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-5:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e7027a"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
index a0edd8e73cb6cd326741fdd5602c0d44795353ad..3aade0a4ec787f19e6777e0ac02c85a46a490e9c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
@@ -22,38 +22,52 @@ graphene-51:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.51
       mac: 00:e0:81:d5:07:60
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:61
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:62
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e9
       interface: InfiniBand
       ip: 172.18.64.51
-      ip6: fe80::202:c903:b:92e9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ea
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-51:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e66eb9"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
index ebcbdc41184356ea74b55777d4ede3b36e7f3a54..d2b3a390072158e3b7cf7bf6b16cc8571c9c0acc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
@@ -22,38 +22,52 @@ graphene-52:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.52
       mac: 00:e0:81:d5:07:0c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:0d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:0e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f9
       interface: InfiniBand
       ip: 172.18.64.52
-      ip6: fe80::202:c903:b:92f9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fa
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-52:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6d1e4"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
index 1eacd472521c243121b0a5ed3f4edd5e7a695e7d..c7f6955509876c4ad5a602ea0616de973dee74b4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
@@ -22,38 +22,52 @@ graphene-53:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.53
       mac: 00:e0:81:d5:07:f8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:f9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:fa
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:09
       interface: InfiniBand
       ip: 172.18.64.53
-      ip6: fe80::202:c903:b:9309
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-53:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe1a"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
index dfc72aa3497596f23aa7de85236dac13e81ef0af..b004cb11f42590f83ee03b80ef61465cd1707c4a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
@@ -22,38 +22,52 @@ graphene-54:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.54
       mac: 00:e0:81:d5:07:a8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:a9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:aa
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:15
       interface: InfiniBand
       ip: 172.18.64.54
-      ip6: fe80::202:c903:b:9315
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:16
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-54:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e9022d"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
index 56c7cfc341554392ab4345bb5276dc7e02a2103a..115923aa9297e9ae05221e5b20abb00b8f146a8b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
@@ -22,38 +22,52 @@ graphene-55:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.55
       mac: 00:e0:81:d5:08:90
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:91
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:92
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0d
       interface: InfiniBand
       ip: 172.18.64.55
-      ip6: fe80::202:c903:b:930d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-55:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e90212"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
index 0b333cd39bf6749351294568536acda146a79327..9c7c00c3440706d43b5eb10dcea343ac98d8169b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
@@ -22,38 +22,52 @@ graphene-57:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.57
       mac: 00:e0:81:d5:08:a0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:a1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:a2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8d
       interface: InfiniBand
       ip: 172.18.64.57
-      ip6: fe80::202:c903:b:918d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-57:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e677a1"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
index 680d317688eb71981c05a76bdb916b978891bb56..1d3cd390cf25cc15daf227a18e6a2f8649e30553 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
@@ -22,38 +22,52 @@ graphene-58:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.58
       mac: 00:e0:81:d5:07:34
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:35
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:36
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9d
       interface: InfiniBand
       ip: 172.18.64.58
-      ip6: fe80::202:c903:b:919d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-58:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca32bd48345"
+      firmware_version: GM3OA52A
       model: Hitachi HDP72503
-      rev: GM3OA52A
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
index 522c503fbc5c8091838b0e06cdd538e7ee6d0d9f..09c90e7eb1b4577fd5aea00021da2466e834d91e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
@@ -22,38 +22,52 @@ graphene-59:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.59
       mac: 00:e0:81:d5:07:2c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:2d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:2e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:95
       interface: InfiniBand
       ip: 172.18.64.59
-      ip6: fe80::202:c903:b:9195
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:96
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-59:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6d228"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
index ee6c255852493168892520cb9395b78408c2300b..8c406bc2897bd349a33253d345ae583cc3995aca 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
@@ -22,38 +22,52 @@ graphene-6:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.6
       mac: 00:e0:81:d5:06:ec
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:ed
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:ee
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7d
       interface: InfiniBand
       ip: 172.18.64.6
-      ip6: fe80::202:c903:b:917d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-6:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371de258a"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
index ee4537dfd62fe8e2eb2cd6e9687b4b364af2d53d..fdad6776abc92a16f14519c47f6b38aa9226c780 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
@@ -22,38 +22,52 @@ graphene-60:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.60
       mac: 00:e0:81:d5:08:4c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:4d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:4e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:85
       interface: InfiniBand
       ip: 172.18.64.60
-      ip6: fe80::202:c903:b:9185
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:86
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-60:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fdf9"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
index de139fd6982b84dc8b9321f01c3021eb0d13888f..b5445bf9495d43acd387c9e79282df11079e7a37 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
@@ -22,38 +22,52 @@ graphene-61:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.61
       mac: 00:e0:81:d5:07:00
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:01
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:02
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:91
       interface: InfiniBand
       ip: 172.18.64.61
-      ip6: fe80::202:c903:b:9191
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:92
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-61:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60bea"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
index 0170b337b8c435a7abe6bd4a7d92bfc4c17ef0e1..51f97b95ddbf22832780cada3182d5b338a61c97 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
@@ -22,38 +22,52 @@ graphene-62:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.62
       mac: 00:e0:81:d5:07:c4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:c5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:c6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:99
       interface: InfiniBand
       ip: 172.18.64.62
-      ip6: fe80::202:c903:b:9199
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-62:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce37"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
index 1331d8325ae23842ed242e1ba4cc6a4e94f50bcd..feadce4b55a5e2b10761e81f2afc912dd9c36163 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
@@ -22,38 +22,52 @@ graphene-63:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.63
       mac: 00:e0:81:d5:06:68
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:69
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:6a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:81
       interface: InfiniBand
       ip: 172.18.64.63
-      ip6: fe80::202:c903:b:9181
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:82
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-63:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b9a"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
index 388e3c814a04cae32873ff048d248c9a7cd1ba45..7866c31d9ae0de44be656c17eefbf8deca0dbcf5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
@@ -22,38 +22,52 @@ graphene-64:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.64
       mac: 00:e0:81:d5:08:88
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:89
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:8a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a1
       interface: InfiniBand
       ip: 172.18.64.64
-      ip6: fe80::202:c903:b:92a1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-64:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce47"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
index 2a90db9b6288456fa7e88863afda3c61f7ca4e7c..770b76477b8a9035361c9d584a236552d6168528 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
@@ -22,38 +22,52 @@ graphene-65:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.65
       mac: 00:e0:81:d5:07:44
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:45
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:46
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d9
       interface: InfiniBand
       ip: 172.18.64.65
-      ip6: fe80::202:c903:b:93d9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:da
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-65:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce3f"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
index 1ef8b3c8e305caaffeddec9cf1753c2ba665728d..fdc06b12031283107b95ae76280f31dab032f8e7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
@@ -22,38 +22,52 @@ graphene-66:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.66
       mac: 00:e0:81:d5:08:14
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:15
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:16
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:49
       interface: InfiniBand
       ip: 172.18.64.66
-      ip6: fe80::202:c903:b:9149
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-66:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce44"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
index 18136ef28a9428f21935c2cb96a69ae7fbd30fb2..8503100e8a18e4ea29850e0994b3e0ef6171a82b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
@@ -22,38 +22,52 @@ graphene-67:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.67
       mac: 00:e0:81:d5:07:b0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:b1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:b2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b9
       interface: InfiniBand
       ip: 172.18.64.67
-      ip6: fe80::202:c903:b:93b9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ba
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-67:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce3c"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
index 0c2cc8d7b4692d6a032b83d1020f042e7a662c53..dbdd28f31d797064bfa4e675db2cd25005ef9cc1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
@@ -22,38 +22,52 @@ graphene-68:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.68
       mac: 00:e0:81:d5:06:50
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:51
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:52
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:91
       interface: InfiniBand
       ip: 172.18.64.68
-      ip6: fe80::202:c903:b:9291
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:92
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-68:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b25"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
index cde035540974d09426adb572b85af37578dd440d..9b80222a1abbbc2df8246b49308226136ded2719 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
@@ -22,38 +22,52 @@ graphene-69:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.69
       mac: 00:e0:81:d5:06:98
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:99
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:9a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c1
       interface: InfiniBand
       ip: 172.18.64.69
-      ip6: fe80::202:c903:b:93c1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-69:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce33"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
index db4b675e22f46add4b26e56c87c627b1fdfc6cb3..b905277c0021d26091899ad77a6d3d563df59b9b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
@@ -22,38 +22,52 @@ graphene-7:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.7
       mac: 00:e0:81:d5:07:3c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:3d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:3e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:61
       interface: InfiniBand
       ip: 172.18.64.7
-      ip6: fe80::202:c903:b:9161
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:62
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-7:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e73c3e"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
index dbf82b58e8bd3822dcb84b146a1cd0894d907e57..0d50bf94be22d0e72e83938f4bfec023d4bd4c89 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
@@ -22,38 +22,52 @@ graphene-70:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.70
       mac: 00:e0:81:d5:07:4c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:4d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:4e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:11
       interface: InfiniBand
       ip: 172.18.64.70
-      ip6: fe80::202:c903:b:9311
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:12
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-70:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e66a94"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
index 13e82a02213303a15a36aadbae292f4ee29f36c3..93ee3f095412778cd71f5f2f75c5823507c39eaa 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
@@ -22,38 +22,52 @@ graphene-71:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.71
       mac: 00:e0:81:d5:07:28
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:29
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:2a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ed
       interface: InfiniBand
       ip: 172.18.64.71
-      ip6: fe80::202:c903:b:92ed
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ee
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-71:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce2a"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
index 80db8585b695f40fd4f3bf7ca01af9100288e41a..72fc6046feec4571ca96688b2a831a2d2fba12b4 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
@@ -22,38 +22,52 @@ graphene-72:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.72
       mac: 00:e0:81:d5:07:e4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:e5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:e6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:95
       interface: InfiniBand
       ip: 172.18.64.72
-      ip6: fe80::202:c903:b:9295
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:96
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-72:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60bc4"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
index 282e853c1ac214da2646d32ce87be9160d272746..9ef5bbd5aec17a9349c53f3fb49848648b4c013f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
@@ -22,38 +22,52 @@ graphene-73:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.73
       mac: 00:e0:81:d5:07:40
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:41
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:42
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fd
       interface: InfiniBand
       ip: 172.18.64.73
-      ip6: fe80::202:c903:b:92fd
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fe
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-73:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce29"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
index 2bdef8924ddd784eefc56045cd97594f66e5eae7..90017c9ca6ba78757286e825021d4ea0b8998b64 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
@@ -22,38 +22,52 @@ graphene-74:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.74
       mac: 00:e0:81:d5:08:80
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:81
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:82
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:dd
       interface: InfiniBand
       ip: 172.18.64.74
-      ip6: fe80::202:c903:b:92dd
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:de
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-74:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce87"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
index ede6e876ddcf6e933f49a9da9598b90f8b013583..ba89cc824f1dd2828dad1042c3d2861a76aee1aa 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
@@ -22,38 +22,52 @@ graphene-75:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.75
       mac: 00:e0:81:d5:07:04
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:05
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:06
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e5
       interface: InfiniBand
       ip: 172.18.64.75
-      ip6: fe80::202:c903:b:92e5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-75:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce35"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
index 7c2b0c3c6cbd58fba65bd5ea4920679845fe96ad..c7093fc6c079c786da193fddb46265d909343ce6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
@@ -22,38 +22,52 @@ graphene-76:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.76
       mac: 00:e0:81:d5:07:20
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:21
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:22
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5
       interface: InfiniBand
       ip: 172.18.64.76
-      ip6: fe80::202:c903:b:92d5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-76:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce34"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
index 9264b441e59af1b20f5aa0204c455361faa715ae..867aa547ffbd9e72363602e3dbc99a74b152626e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
@@ -22,38 +22,52 @@ graphene-77:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.77
       mac: 00:e0:81:d5:07:a0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:a1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:a2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e1
       interface: InfiniBand
       ip: 172.18.64.77
-      ip6: fe80::202:c903:b:92e1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-77:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce28"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
index ef61a491bc4f963c202c4318699a7f8e82cd0812..558633dc2eb08508293b83a719a41cfd5c591294 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
@@ -22,38 +22,52 @@ graphene-78:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.78
       mac: 00:e0:81:d5:08:50
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:51
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:52
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:01
       interface: InfiniBand
       ip: 172.18.64.78
-      ip6: fe80::202:c903:b:9301
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:02
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-78:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60bc8"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
index 2b6f8c2af09f7a596ab52db095188a01a82c20c8..d27e2645015b7f20b172b82800b68ac74890d775 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
@@ -22,38 +22,52 @@ graphene-79:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.79
       mac: 00:e0:81:d5:08:78
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:79
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:7a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f5
       interface: InfiniBand
       ip: 172.18.64.79
-      ip6: fe80::202:c903:b:92f5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-79:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e901f3"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
index 981e306db2532574631d89fcc265b38cfb5d3ca0..3430b722811868138b5ef207a255f9a5c6203462 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
@@ -22,38 +22,52 @@ graphene-8:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.8
       mac: 00:e0:81:d5:08:08
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:09
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:0a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:75
       interface: InfiniBand
       ip: 172.18.64.8
-      ip6: fe80::202:c903:b:9175
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:76
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-8:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e70e50"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
index 9698089bafb3c638c9858a189636f0ee9ea61b4c..3bf1ff25dc44ea141bbd2cea3b2a35e1e582a26e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
@@ -22,38 +22,52 @@ graphene-80:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.80
       mac: 00:e0:81:d5:06:d8
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:d9
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:da
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d1
       interface: InfiniBand
       ip: 172.18.64.80
-      ip6: fe80::202:c903:b:92d1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-80:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b2a"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
index c13f5327e5454e8f07352bcdfb6665d943995bc1..b171145801fbf187438b5ea9f2abe8e2d867a4ec 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
@@ -22,38 +22,52 @@ graphene-81:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.81
       mac: 00:e0:81:d5:07:24
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:25
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:26
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a9
       interface: InfiniBand
       ip: 172.18.64.81
-      ip6: fe80::202:c903:b:93a9
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:aa
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-81:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce88"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
index 5eb57b8f45f5f1918f790a42ddb49eae5810d43b..2886519f09b03d6e9d2f0cb035fc5e4b72a0ba70 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
@@ -22,38 +22,52 @@ graphene-82:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.82
       mac: 00:e0:81:d5:07:b4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:b5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:b6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:95
       interface: InfiniBand
       ip: 172.18.64.82
-      ip6: fe80::202:c903:b:9395
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:96
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-82:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce18"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
index 65335c5d11716a5b1ff77c47103d039351991cfa..e93bc4d07ec7f74aa28ba4ab4dc0ad3f4ee81fee 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
@@ -22,38 +22,52 @@ graphene-84:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.84
       mac: 00:e0:81:d5:07:18
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:19
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:1a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d
       interface: InfiniBand
       ip: 172.18.64.84
-      ip6: fe80::202:c903:b:939d
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9e
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-84:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e9021d"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
index b97ce4c2edf5dde2cea13c43f31ea758596960c0..ebc9a672fbc7318b7c0419f5c982333d37b8e6f7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
@@ -22,38 +22,52 @@ graphene-85:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.85
       mac: 00:e0:81:d5:07:ec
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:ed
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:ee
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:99
       interface: InfiniBand
       ip: 172.18.64.85
-      ip6: fe80::202:c903:b:9399
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-85:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b13"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
index 9458ec821625535fcef1beb508037a9b4ae4fc37..c91f916ab99d3c2652ab0d58f3a466c47a60ed73 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
@@ -22,38 +22,52 @@ graphene-87:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.87
       mac: 00:e0:81:d5:07:58
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:59
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:5a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ad
       interface: InfiniBand
       ip: 172.18.64.87
-      ip6: fe80::202:c903:b:93ad
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ae
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-87:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce12"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
index 5322ca980b116e6ef6cf92808a94dbd239f5e2db..3f6e0a4670540e5c7fda7e0f6e4d487bf33151b6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
@@ -22,38 +22,52 @@ graphene-88:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.88
       mac: 00:e0:81:d5:08:60
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:61
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:62
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b1
       interface: InfiniBand
       ip: 172.18.64.88
-      ip6: fe80::202:c903:b:93b1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-88:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cdfd"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
index 42d4a111268c5c8bc76cbcef042a077ab2a9162e..5238a15be62731024f06d096b0dfeb2c6ba791f5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
@@ -22,38 +22,52 @@ graphene-89:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.89
       mac: 00:e0:81:d5:08:98
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:99
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:9a
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ed
       interface: InfiniBand
       ip: 172.18.64.89
-      ip6: fe80::202:c903:b:5ced
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ee
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-89:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cdcf"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
index 7275331b6f75e4a3ea6917400606deb94038d888..651dc62ad61ce67c4afeecc49ee8ccb1cd13363d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
@@ -22,38 +22,52 @@ graphene-9:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.9
       mac: 00:e0:81:d5:08:84
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:85
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:86
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:69
       interface: InfiniBand
       ip: 172.18.64.9
-      ip6: fe80::202:c903:b:9169
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-9:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6bf36"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
index 0d09ea894ea0fd5eed90c86c391554b8b6b0cb10..46a956e4d4d07c0188279bc841f9acf137ce20f7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
@@ -22,38 +22,52 @@ graphene-90:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.90
       mac: 00:e0:81:d5:06:64
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:65
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:66
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:09
       interface: InfiniBand
       ip: 172.18.64.90
-      ip6: fe80::202:c903:b:5d09
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0a
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-90:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce40"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
index 20a38f8a76a848536f16f25f53dea2625d2ecdf3..b0609adc79cf947a705dd5a9d09b90b1c26d849c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
@@ -22,38 +22,52 @@ graphene-91:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.91
       mac: 00:e0:81:d5:06:dc
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:dd
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:de
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d1
       interface: InfiniBand
       ip: 172.18.64.91
-      ip6: fe80::202:c903:b:5cd1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-91:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce49"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
index 5b6dc39ff55849c483c20b631bb21475798e2ec0..d1f34ecfac970ca1535d51030b38bf06b20ed7f3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
@@ -22,38 +22,52 @@ graphene-92:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.92
       mac: 00:e0:81:d5:07:a4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:a5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:07:a6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e5
       interface: InfiniBand
       ip: 172.18.64.92
-      ip6: fe80::202:c903:b:5ce5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-92:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b32"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
index 0118427fb9bd85b2b0d7d53c3f4042c1becae7d2..76cbcd92a04284bbd23d4ee290c66866c4440116 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
@@ -22,38 +22,52 @@ graphene-93:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.93
       mac: 00:e0:81:d5:06:4c
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:4d
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:4e
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ad
       interface: InfiniBand
       ip: 172.18.64.93
-      ip6: fe80::202:c903:b:5ead
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ae
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-93:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fffd"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
index d7e78383d1ea4152c2bf2338cb6659d65face01b..52655568d962b71fad076aab1ee4dcec38ccaf76 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
@@ -22,38 +22,52 @@ graphene-95:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.95
       mac: 00:e0:81:d5:06:c0
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:c1
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:06:c2
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:95
       interface: InfiniBand
       ip: 172.18.64.95
-      ip6: fe80::202:c903:b:5e95
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:96
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-95:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e6855b"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
index a05c57e30969ab882ca0a12bb7409fd2c5c8784a..7886c0a9371b59ce332c669b22a0ff6cd9268f47 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
@@ -22,38 +22,52 @@ graphene-97:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.97
       mac: 00:e0:81:d5:08:00
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:01
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:02
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d5
       interface: InfiniBand
       ip: 172.18.64.97
-      ip6: fe80::202:c903:b:5ed5
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d6
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-97:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fc48"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
index 3102807591886bf7d84d37f5784d9ebb29728522..4e3c670a9b477d758a85fe69a9dc2354d80ad52e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
@@ -22,38 +22,52 @@ graphene-99:
       management: true
     eth0:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       ip: 172.16.64.99
       mac: 00:e0:81:d5:08:d4
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp3s0
       rate: 1000000000
+      vendor: Intel
     eth1:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:d5
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp4s0
       rate: 100000000
+      vendor: Intel
     eth2:
       driver: e1000e
+      firmware_version: 1.8-0
       interface: Ethernet
       mac: 00:e0:81:d5:08:d6
       management: false
+      model: 82574L Gigabit Network Connection
+      name: enp5s0
+      rate: 0
+      vendor: Intel
     ib0:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b1
       interface: InfiniBand
       ip: 172.18.64.99
-      ip6: fe80::202:c903:b:5eb1
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 20000000000
-      version: MT26418
+      vendor: Mellanox Technologies
     ib1:
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b2
       interface: InfiniBand
       management: false
+      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
       rate: 10000000000
-      version: MT26418
+      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -80,8 +94,8 @@ graphene-99:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce36"
+      firmware_version: JPFOA3EA
       model: Hitachi HDS72103
-      rev: JPFOA3EA
       size: 320072933376
       vendor: Hitachi
   supported_job_types: