diff --git a/data/grid5000/sites/nancy/clusters/grappe/grappe.json b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
index f98d2b08041304fa085aee44b82a25db298de9f8..f6da287f00b9220f3b2bfbb89097ad55507a4a8e 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/grappe.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
@@ -1,119 +1,7 @@
 {
   "created_at": "Thu, 20 Aug 2020 00:00:00 GMT",
   "exotic": false,
-  "grappe-1": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::1"
-      }
-    }
-  },
-  "grappe-10": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::a"
-      }
-    }
-  },
-  "grappe-11": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::b"
-      }
-    }
-  },
-  "grappe-12": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::c"
-      }
-    }
-  },
-  "grappe-13": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::d"
-      }
-    }
-  },
-  "grappe-14": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::e"
-      }
-    }
-  },
-  "grappe-15": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::f"
-      }
-    }
-  },
-  "grappe-16": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::10"
-      }
-    }
-  },
-  "grappe-2": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::2"
-      }
-    }
-  },
-  "grappe-3": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::3"
-      }
-    }
-  },
-  "grappe-4": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::4"
-      }
-    }
-  },
-  "grappe-5": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::5"
-      }
-    }
-  },
-  "grappe-6": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::6"
-      }
-    }
-  },
-  "grappe-7": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::7"
-      }
-    }
-  },
-  "grappe-8": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::8"
-      }
-    }
-  },
-  "grappe-9": {
-    "network_adapters": {
-      "eth0": {
-        "ip6": "2001:660:4406:500:f::9"
-      }
-    }
-  },
-  "kavlan": false,
+  "kavlan": true,
   "metrics": [
 
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
index aab2c1d7a65032ede460dc9b407f9135a36011dc..b19e7d34558bae8fb60cbd66506787d1665fc0fa 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "22N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.1",
+      "kavlan-11": "10.7.222.1",
+      "kavlan-12": "10.11.222.1",
+      "kavlan-13": "10.15.222.1",
+      "kavlan-14": "10.19.222.1",
+      "kavlan-16": "10.27.222.1",
+      "kavlan-18": "10.35.222.1",
+      "kavlan-2": "192.168.222.1",
+      "kavlan-20": "10.43.222.1",
+      "kavlan-21": "10.47.222.1",
+      "kavlan-3": "192.168.238.1",
+      "kavlan-4": "10.16.14.1",
+      "kavlan-5": "10.16.78.1",
+      "kavlan-6": "10.16.142.1",
+      "kavlan-7": "10.16.206.1",
+      "kavlan-8": "10.17.14.1",
+      "kavlan-9": "10.17.78.1"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::1",
+      "kavlan-11": "2001:660:4406:58b:f::1",
+      "kavlan-12": "2001:660:4406:58c:f::1",
+      "kavlan-13": "2001:660:4406:58d:f::1",
+      "kavlan-14": "2001:660:4406:58e:f::1",
+      "kavlan-16": "2001:660:4406:590:f::1",
+      "kavlan-18": "2001:660:4406:592:f::1",
+      "kavlan-2": "2001:660:4406:582:f::1",
+      "kavlan-20": "2001:660:4406:594:f::1",
+      "kavlan-21": "2001:660:4406:595:f::1",
+      "kavlan-3": "2001:660:4406:583:f::1",
+      "kavlan-4": "2001:660:4406:584:f::1",
+      "kavlan-5": "2001:660:4406:585:f::1",
+      "kavlan-6": "2001:660:4406:586:f::1",
+      "kavlan-7": "2001:660:4406:587:f::1",
+      "kavlan-8": "2001:660:4406:588:f::1",
+      "kavlan-9": "2001:660:4406:589:f::1"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.1",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::1",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:64:80",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-1.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/1"
+      "switch_port": "Ethernet1/1/1",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:64:81",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:69:0c",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:69:0d",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:69:0e",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:69:0f",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.1",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:31:16",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-1-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bbf0026d92cdd083b9106",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bbf0026d92cdd08422c57",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-1"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
index d4965e088f1097ba210f1bdaaa9f506b8de28b5b..e69d4a31dfb744fb7dae1f73ec0edf1d68a361d8 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "G0N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.10",
+      "kavlan-11": "10.7.222.10",
+      "kavlan-12": "10.11.222.10",
+      "kavlan-13": "10.15.222.10",
+      "kavlan-14": "10.19.222.10",
+      "kavlan-16": "10.27.222.10",
+      "kavlan-18": "10.35.222.10",
+      "kavlan-2": "192.168.222.10",
+      "kavlan-20": "10.43.222.10",
+      "kavlan-21": "10.47.222.10",
+      "kavlan-3": "192.168.238.10",
+      "kavlan-4": "10.16.14.10",
+      "kavlan-5": "10.16.78.10",
+      "kavlan-6": "10.16.142.10",
+      "kavlan-7": "10.16.206.10",
+      "kavlan-8": "10.17.14.10",
+      "kavlan-9": "10.17.78.10"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::a",
+      "kavlan-11": "2001:660:4406:58b:f::a",
+      "kavlan-12": "2001:660:4406:58c:f::a",
+      "kavlan-13": "2001:660:4406:58d:f::a",
+      "kavlan-14": "2001:660:4406:58e:f::a",
+      "kavlan-16": "2001:660:4406:590:f::a",
+      "kavlan-18": "2001:660:4406:592:f::a",
+      "kavlan-2": "2001:660:4406:582:f::a",
+      "kavlan-20": "2001:660:4406:594:f::a",
+      "kavlan-21": "2001:660:4406:595:f::a",
+      "kavlan-3": "2001:660:4406:583:f::a",
+      "kavlan-4": "2001:660:4406:584:f::a",
+      "kavlan-5": "2001:660:4406:585:f::a",
+      "kavlan-6": "2001:660:4406:586:f::a",
+      "kavlan-7": "2001:660:4406:587:f::a",
+      "kavlan-8": "2001:660:4406:588:f::a",
+      "kavlan-9": "2001:660:4406:589:f::a"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.10",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::a",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:68:c0",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-10.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/10"
+      "switch_port": "Ethernet1/1/10",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:68:c1",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:6c:80",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:6c:81",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:6c:82",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:6c:83",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.10",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:92:50",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-10-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700e7935a0026d92cf00840cea9",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700e7935a0026d92cf108477e7f",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-10"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
index cff474de552107da2d74b666c9e6529a8cfac71a..3673a90b62fe605fe31f83e8e9da4a3a66c8ec89 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "42N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.11",
+      "kavlan-11": "10.7.222.11",
+      "kavlan-12": "10.11.222.11",
+      "kavlan-13": "10.15.222.11",
+      "kavlan-14": "10.19.222.11",
+      "kavlan-16": "10.27.222.11",
+      "kavlan-18": "10.35.222.11",
+      "kavlan-2": "192.168.222.11",
+      "kavlan-20": "10.43.222.11",
+      "kavlan-21": "10.47.222.11",
+      "kavlan-3": "192.168.238.11",
+      "kavlan-4": "10.16.14.11",
+      "kavlan-5": "10.16.78.11",
+      "kavlan-6": "10.16.142.11",
+      "kavlan-7": "10.16.206.11",
+      "kavlan-8": "10.17.14.11",
+      "kavlan-9": "10.17.78.11"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::b",
+      "kavlan-11": "2001:660:4406:58b:f::b",
+      "kavlan-12": "2001:660:4406:58c:f::b",
+      "kavlan-13": "2001:660:4406:58d:f::b",
+      "kavlan-14": "2001:660:4406:58e:f::b",
+      "kavlan-16": "2001:660:4406:590:f::b",
+      "kavlan-18": "2001:660:4406:592:f::b",
+      "kavlan-2": "2001:660:4406:582:f::b",
+      "kavlan-20": "2001:660:4406:594:f::b",
+      "kavlan-21": "2001:660:4406:595:f::b",
+      "kavlan-3": "2001:660:4406:583:f::b",
+      "kavlan-4": "2001:660:4406:584:f::b",
+      "kavlan-5": "2001:660:4406:585:f::b",
+      "kavlan-6": "2001:660:4406:586:f::b",
+      "kavlan-7": "2001:660:4406:587:f::b",
+      "kavlan-8": "2001:660:4406:588:f::b",
+      "kavlan-9": "2001:660:4406:589:f::b"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.11",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::b",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:6b:e0",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-11.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/11"
+      "switch_port": "Ethernet1/1/11",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:6b:e1",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "34:48:ed:f2:b5:f0",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "34:48:ed:f2:b5:f1",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "34:48:ed:f2:b5:f2",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "34:48:ed:f2:b5:f3",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.11",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:9e:02",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-11-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f2538d0026d92cbd08372b5f",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f2538d0026d92cbe083deb90",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-11"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
index c77ed73e0e82630aae79aa2dacec920517751f3f..24cd0515e2a5a3f9f72b7f9c96b5cf4c599af9f5 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "32N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.12",
+      "kavlan-11": "10.7.222.12",
+      "kavlan-12": "10.11.222.12",
+      "kavlan-13": "10.15.222.12",
+      "kavlan-14": "10.19.222.12",
+      "kavlan-16": "10.27.222.12",
+      "kavlan-18": "10.35.222.12",
+      "kavlan-2": "192.168.222.12",
+      "kavlan-20": "10.43.222.12",
+      "kavlan-21": "10.47.222.12",
+      "kavlan-3": "192.168.238.12",
+      "kavlan-4": "10.16.14.12",
+      "kavlan-5": "10.16.78.12",
+      "kavlan-6": "10.16.142.12",
+      "kavlan-7": "10.16.206.12",
+      "kavlan-8": "10.17.14.12",
+      "kavlan-9": "10.17.78.12"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::c",
+      "kavlan-11": "2001:660:4406:58b:f::c",
+      "kavlan-12": "2001:660:4406:58c:f::c",
+      "kavlan-13": "2001:660:4406:58d:f::c",
+      "kavlan-14": "2001:660:4406:58e:f::c",
+      "kavlan-16": "2001:660:4406:590:f::c",
+      "kavlan-18": "2001:660:4406:592:f::c",
+      "kavlan-2": "2001:660:4406:582:f::c",
+      "kavlan-20": "2001:660:4406:594:f::c",
+      "kavlan-21": "2001:660:4406:595:f::c",
+      "kavlan-3": "2001:660:4406:583:f::c",
+      "kavlan-4": "2001:660:4406:584:f::c",
+      "kavlan-5": "2001:660:4406:585:f::c",
+      "kavlan-6": "2001:660:4406:586:f::c",
+      "kavlan-7": "2001:660:4406:587:f::c",
+      "kavlan-8": "2001:660:4406:588:f::c",
+      "kavlan-9": "2001:660:4406:589:f::c"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.12",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::c",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:6b:b0",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-12.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/12"
+      "switch_port": "Ethernet1/1/12",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:6b:b1",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:68:80",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:68:81",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:68:82",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:68:83",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.12",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:20:90",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-12-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700e7916d0026d92ce1083a28e8",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700e7916d0026d92ce108410cc9",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-12"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
index 9283aaba8d143d36c17f96efd8d831e3e2cde55c..2c091c03d839885221888a694cd5ee835c92a913 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "12N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.13",
+      "kavlan-11": "10.7.222.13",
+      "kavlan-12": "10.11.222.13",
+      "kavlan-13": "10.15.222.13",
+      "kavlan-14": "10.19.222.13",
+      "kavlan-16": "10.27.222.13",
+      "kavlan-18": "10.35.222.13",
+      "kavlan-2": "192.168.222.13",
+      "kavlan-20": "10.43.222.13",
+      "kavlan-21": "10.47.222.13",
+      "kavlan-3": "192.168.238.13",
+      "kavlan-4": "10.16.14.13",
+      "kavlan-5": "10.16.78.13",
+      "kavlan-6": "10.16.142.13",
+      "kavlan-7": "10.16.206.13",
+      "kavlan-8": "10.17.14.13",
+      "kavlan-9": "10.17.78.13"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::d",
+      "kavlan-11": "2001:660:4406:58b:f::d",
+      "kavlan-12": "2001:660:4406:58c:f::d",
+      "kavlan-13": "2001:660:4406:58d:f::d",
+      "kavlan-14": "2001:660:4406:58e:f::d",
+      "kavlan-16": "2001:660:4406:590:f::d",
+      "kavlan-18": "2001:660:4406:592:f::d",
+      "kavlan-2": "2001:660:4406:582:f::d",
+      "kavlan-20": "2001:660:4406:594:f::d",
+      "kavlan-21": "2001:660:4406:595:f::d",
+      "kavlan-3": "2001:660:4406:583:f::d",
+      "kavlan-4": "2001:660:4406:584:f::d",
+      "kavlan-5": "2001:660:4406:585:f::d",
+      "kavlan-6": "2001:660:4406:586:f::d",
+      "kavlan-7": "2001:660:4406:587:f::d",
+      "kavlan-8": "2001:660:4406:588:f::d",
+      "kavlan-9": "2001:660:4406:589:f::d"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.13",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::d",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:69:10",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-13.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/13"
+      "switch_port": "Ethernet1/1/13",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:69:11",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:60:e4",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:60:e5",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:60:e6",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:60:e7",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.13",
       "kavlan": false,
       "mac": "2c:ea:7f:ee:f4:74",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-13-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bc90026d92cd20836928f",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bc90026d92cd3083d35cf",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-13"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
index 06c8f98ff41085beec0fc2d9081e04b416771c76..96de80b9e8f8ec3b9362a5f66458693b0c43e40e 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "H0N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.14",
+      "kavlan-11": "10.7.222.14",
+      "kavlan-12": "10.11.222.14",
+      "kavlan-13": "10.15.222.14",
+      "kavlan-14": "10.19.222.14",
+      "kavlan-16": "10.27.222.14",
+      "kavlan-18": "10.35.222.14",
+      "kavlan-2": "192.168.222.14",
+      "kavlan-20": "10.43.222.14",
+      "kavlan-21": "10.47.222.14",
+      "kavlan-3": "192.168.238.14",
+      "kavlan-4": "10.16.14.14",
+      "kavlan-5": "10.16.78.14",
+      "kavlan-6": "10.16.142.14",
+      "kavlan-7": "10.16.206.14",
+      "kavlan-8": "10.17.14.14",
+      "kavlan-9": "10.17.78.14"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::e",
+      "kavlan-11": "2001:660:4406:58b:f::e",
+      "kavlan-12": "2001:660:4406:58c:f::e",
+      "kavlan-13": "2001:660:4406:58d:f::e",
+      "kavlan-14": "2001:660:4406:58e:f::e",
+      "kavlan-16": "2001:660:4406:590:f::e",
+      "kavlan-18": "2001:660:4406:592:f::e",
+      "kavlan-2": "2001:660:4406:582:f::e",
+      "kavlan-20": "2001:660:4406:594:f::e",
+      "kavlan-21": "2001:660:4406:595:f::e",
+      "kavlan-3": "2001:660:4406:583:f::e",
+      "kavlan-4": "2001:660:4406:584:f::e",
+      "kavlan-5": "2001:660:4406:585:f::e",
+      "kavlan-6": "2001:660:4406:586:f::e",
+      "kavlan-7": "2001:660:4406:587:f::e",
+      "kavlan-8": "2001:660:4406:588:f::e",
+      "kavlan-9": "2001:660:4406:589:f::e"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.14",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::e",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:6b:10",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-14.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/14"
+      "switch_port": "Ethernet1/1/14",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:6b:11",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:6e:fc",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:6e:fd",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:6e:fe",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:6e:ff",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.14",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:93:16",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-14-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97970026d92ce40837a0dc",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97970026d92ce4083ec66e",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-14"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
index 3e61479d4afc9288dbc654710d497eba8994b76e..0d26cb7a8798f2613a75e061099860244d3f0c5b 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "11N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.15",
+      "kavlan-11": "10.7.222.15",
+      "kavlan-12": "10.11.222.15",
+      "kavlan-13": "10.15.222.15",
+      "kavlan-14": "10.19.222.15",
+      "kavlan-16": "10.27.222.15",
+      "kavlan-18": "10.35.222.15",
+      "kavlan-2": "192.168.222.15",
+      "kavlan-20": "10.43.222.15",
+      "kavlan-21": "10.47.222.15",
+      "kavlan-3": "192.168.238.15",
+      "kavlan-4": "10.16.14.15",
+      "kavlan-5": "10.16.78.15",
+      "kavlan-6": "10.16.142.15",
+      "kavlan-7": "10.16.206.15",
+      "kavlan-8": "10.17.14.15",
+      "kavlan-9": "10.17.78.15"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::f",
+      "kavlan-11": "2001:660:4406:58b:f::f",
+      "kavlan-12": "2001:660:4406:58c:f::f",
+      "kavlan-13": "2001:660:4406:58d:f::f",
+      "kavlan-14": "2001:660:4406:58e:f::f",
+      "kavlan-16": "2001:660:4406:590:f::f",
+      "kavlan-18": "2001:660:4406:592:f::f",
+      "kavlan-2": "2001:660:4406:582:f::f",
+      "kavlan-20": "2001:660:4406:594:f::f",
+      "kavlan-21": "2001:660:4406:595:f::f",
+      "kavlan-3": "2001:660:4406:583:f::f",
+      "kavlan-4": "2001:660:4406:584:f::f",
+      "kavlan-5": "2001:660:4406:585:f::f",
+      "kavlan-6": "2001:660:4406:586:f::f",
+      "kavlan-7": "2001:660:4406:587:f::f",
+      "kavlan-8": "2001:660:4406:588:f::f",
+      "kavlan-9": "2001:660:4406:589:f::f"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.15",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::f",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:69:00",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-15.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/15"
+      "switch_port": "Ethernet1/1/15",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:69:01",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:e4",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:e5",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:e6",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:e7",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.15",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:21:c2",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-15-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9cdcc0026d92cfa0839e7ec",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9cdcc0026d92cfa08410106",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-15"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
index 81c1f96e54819acbd4853e28998ab020fe362e91..56c7dc3a5fc5ba33b0978881c64b004a511b5cc5 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "21N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.16",
+      "kavlan-11": "10.7.222.16",
+      "kavlan-12": "10.11.222.16",
+      "kavlan-13": "10.15.222.16",
+      "kavlan-14": "10.19.222.16",
+      "kavlan-16": "10.27.222.16",
+      "kavlan-18": "10.35.222.16",
+      "kavlan-2": "192.168.222.16",
+      "kavlan-20": "10.43.222.16",
+      "kavlan-21": "10.47.222.16",
+      "kavlan-3": "192.168.238.16",
+      "kavlan-4": "10.16.14.16",
+      "kavlan-5": "10.16.78.16",
+      "kavlan-6": "10.16.142.16",
+      "kavlan-7": "10.16.206.16",
+      "kavlan-8": "10.17.14.16",
+      "kavlan-9": "10.17.78.16"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::10",
+      "kavlan-11": "2001:660:4406:58b:f::10",
+      "kavlan-12": "2001:660:4406:58c:f::10",
+      "kavlan-13": "2001:660:4406:58d:f::10",
+      "kavlan-14": "2001:660:4406:58e:f::10",
+      "kavlan-16": "2001:660:4406:590:f::10",
+      "kavlan-18": "2001:660:4406:592:f::10",
+      "kavlan-2": "2001:660:4406:582:f::10",
+      "kavlan-20": "2001:660:4406:594:f::10",
+      "kavlan-21": "2001:660:4406:595:f::10",
+      "kavlan-3": "2001:660:4406:583:f::10",
+      "kavlan-4": "2001:660:4406:584:f::10",
+      "kavlan-5": "2001:660:4406:585:f::10",
+      "kavlan-6": "2001:660:4406:586:f::10",
+      "kavlan-7": "2001:660:4406:587:f::10",
+      "kavlan-8": "2001:660:4406:588:f::10",
+      "kavlan-9": "2001:660:4406:589:f::10"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.16",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::10",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:68:70",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-16.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/16"
+      "switch_port": "Ethernet1/1/16",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:68:71",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:bc",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:bd",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:be",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:bf",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.16",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:81:04",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-16-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978c0026d92cb0083526f3",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978c0026d92cb1083bc89b",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-16"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
index 896df8d0ca26774c268717622de87aefe8e4fc92..4ee5016b65e3ffc8dc76bbcd61d491dccd8f9c67 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "61N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.2",
+      "kavlan-11": "10.7.222.2",
+      "kavlan-12": "10.11.222.2",
+      "kavlan-13": "10.15.222.2",
+      "kavlan-14": "10.19.222.2",
+      "kavlan-16": "10.27.222.2",
+      "kavlan-18": "10.35.222.2",
+      "kavlan-2": "192.168.222.2",
+      "kavlan-20": "10.43.222.2",
+      "kavlan-21": "10.47.222.2",
+      "kavlan-3": "192.168.238.2",
+      "kavlan-4": "10.16.14.2",
+      "kavlan-5": "10.16.78.2",
+      "kavlan-6": "10.16.142.2",
+      "kavlan-7": "10.16.206.2",
+      "kavlan-8": "10.17.14.2",
+      "kavlan-9": "10.17.78.2"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::2",
+      "kavlan-11": "2001:660:4406:58b:f::2",
+      "kavlan-12": "2001:660:4406:58c:f::2",
+      "kavlan-13": "2001:660:4406:58d:f::2",
+      "kavlan-14": "2001:660:4406:58e:f::2",
+      "kavlan-16": "2001:660:4406:590:f::2",
+      "kavlan-18": "2001:660:4406:592:f::2",
+      "kavlan-2": "2001:660:4406:582:f::2",
+      "kavlan-20": "2001:660:4406:594:f::2",
+      "kavlan-21": "2001:660:4406:595:f::2",
+      "kavlan-3": "2001:660:4406:583:f::2",
+      "kavlan-4": "2001:660:4406:584:f::2",
+      "kavlan-5": "2001:660:4406:585:f::2",
+      "kavlan-6": "2001:660:4406:586:f::2",
+      "kavlan-7": "2001:660:4406:587:f::2",
+      "kavlan-8": "2001:660:4406:588:f::2",
+      "kavlan-9": "2001:660:4406:589:f::2"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.2",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::2",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:a9:d0",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-2.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/2"
+      "switch_port": "Ethernet1/1/2",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:a9:d1",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:30",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:31",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:32",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:33",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.2",
       "kavlan": false,
       "mac": "2c:ea:7f:ee:88:7a",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-2-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9be020026d92cbc083ce78c",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9be020026d92cbc08441067",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-2"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
index 17d09f8dc3b5ff7042de1d77e3fa7f9fe9806d49..76b76352d6dd6ccfab3c5922d536c1fdcb72afc3 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "31N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.3",
+      "kavlan-11": "10.7.222.3",
+      "kavlan-12": "10.11.222.3",
+      "kavlan-13": "10.15.222.3",
+      "kavlan-14": "10.19.222.3",
+      "kavlan-16": "10.27.222.3",
+      "kavlan-18": "10.35.222.3",
+      "kavlan-2": "192.168.222.3",
+      "kavlan-20": "10.43.222.3",
+      "kavlan-21": "10.47.222.3",
+      "kavlan-3": "192.168.238.3",
+      "kavlan-4": "10.16.14.3",
+      "kavlan-5": "10.16.78.3",
+      "kavlan-6": "10.16.142.3",
+      "kavlan-7": "10.16.206.3",
+      "kavlan-8": "10.17.14.3",
+      "kavlan-9": "10.17.78.3"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::3",
+      "kavlan-11": "2001:660:4406:58b:f::3",
+      "kavlan-12": "2001:660:4406:58c:f::3",
+      "kavlan-13": "2001:660:4406:58d:f::3",
+      "kavlan-14": "2001:660:4406:58e:f::3",
+      "kavlan-16": "2001:660:4406:590:f::3",
+      "kavlan-18": "2001:660:4406:592:f::3",
+      "kavlan-2": "2001:660:4406:582:f::3",
+      "kavlan-20": "2001:660:4406:594:f::3",
+      "kavlan-21": "2001:660:4406:595:f::3",
+      "kavlan-3": "2001:660:4406:583:f::3",
+      "kavlan-4": "2001:660:4406:584:f::3",
+      "kavlan-5": "2001:660:4406:585:f::3",
+      "kavlan-6": "2001:660:4406:586:f::3",
+      "kavlan-7": "2001:660:4406:587:f::3",
+      "kavlan-8": "2001:660:4406:588:f::3",
+      "kavlan-9": "2001:660:4406:589:f::3"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.3",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::3",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:ab:50",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-3.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/3"
+      "switch_port": "Ethernet1/1/3",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:ab:51",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:34",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:35",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:36",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:5d:37",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.3",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:1d:fc",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-3-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97950026d92ce308344ec5",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97950026d92ce4083b00bf",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-3"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
index f311f4bd4f9825d693728ca7662f81557aa0fdeb..5d61f409fc86f4128f27fba692b3f8953154581a 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "51N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.4",
+      "kavlan-11": "10.7.222.4",
+      "kavlan-12": "10.11.222.4",
+      "kavlan-13": "10.15.222.4",
+      "kavlan-14": "10.19.222.4",
+      "kavlan-16": "10.27.222.4",
+      "kavlan-18": "10.35.222.4",
+      "kavlan-2": "192.168.222.4",
+      "kavlan-20": "10.43.222.4",
+      "kavlan-21": "10.47.222.4",
+      "kavlan-3": "192.168.238.4",
+      "kavlan-4": "10.16.14.4",
+      "kavlan-5": "10.16.78.4",
+      "kavlan-6": "10.16.142.4",
+      "kavlan-7": "10.16.206.4",
+      "kavlan-8": "10.17.14.4",
+      "kavlan-9": "10.17.78.4"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::4",
+      "kavlan-11": "2001:660:4406:58b:f::4",
+      "kavlan-12": "2001:660:4406:58c:f::4",
+      "kavlan-13": "2001:660:4406:58d:f::4",
+      "kavlan-14": "2001:660:4406:58e:f::4",
+      "kavlan-16": "2001:660:4406:590:f::4",
+      "kavlan-18": "2001:660:4406:592:f::4",
+      "kavlan-2": "2001:660:4406:582:f::4",
+      "kavlan-20": "2001:660:4406:594:f::4",
+      "kavlan-21": "2001:660:4406:595:f::4",
+      "kavlan-3": "2001:660:4406:583:f::4",
+      "kavlan-4": "2001:660:4406:584:f::4",
+      "kavlan-5": "2001:660:4406:585:f::4",
+      "kavlan-6": "2001:660:4406:586:f::4",
+      "kavlan-7": "2001:660:4406:587:f::4",
+      "kavlan-8": "2001:660:4406:588:f::4",
+      "kavlan-9": "2001:660:4406:589:f::4"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.4",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::4",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:b4:f0",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-4.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/4"
+      "switch_port": "Ethernet1/1/4",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:b4:f1",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:67:cc",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:67:cd",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:67:ce",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:67:cf",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.4",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:32:60",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-4-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9cdce0026d92d0008324224",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9cdce0026d92d010839531b",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-4"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
index 4e59be3962a1aaed9151d0adde638420a7a42a01..82654a380df4df512802aa6883704e5ae707ed73 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "41N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.5",
+      "kavlan-11": "10.7.222.5",
+      "kavlan-12": "10.11.222.5",
+      "kavlan-13": "10.15.222.5",
+      "kavlan-14": "10.19.222.5",
+      "kavlan-16": "10.27.222.5",
+      "kavlan-18": "10.35.222.5",
+      "kavlan-2": "192.168.222.5",
+      "kavlan-20": "10.43.222.5",
+      "kavlan-21": "10.47.222.5",
+      "kavlan-3": "192.168.238.5",
+      "kavlan-4": "10.16.14.5",
+      "kavlan-5": "10.16.78.5",
+      "kavlan-6": "10.16.142.5",
+      "kavlan-7": "10.16.206.5",
+      "kavlan-8": "10.17.14.5",
+      "kavlan-9": "10.17.78.5"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::5",
+      "kavlan-11": "2001:660:4406:58b:f::5",
+      "kavlan-12": "2001:660:4406:58c:f::5",
+      "kavlan-13": "2001:660:4406:58d:f::5",
+      "kavlan-14": "2001:660:4406:58e:f::5",
+      "kavlan-16": "2001:660:4406:590:f::5",
+      "kavlan-18": "2001:660:4406:592:f::5",
+      "kavlan-2": "2001:660:4406:582:f::5",
+      "kavlan-20": "2001:660:4406:594:f::5",
+      "kavlan-21": "2001:660:4406:595:f::5",
+      "kavlan-3": "2001:660:4406:583:f::5",
+      "kavlan-4": "2001:660:4406:584:f::5",
+      "kavlan-5": "2001:660:4406:585:f::5",
+      "kavlan-6": "2001:660:4406:586:f::5",
+      "kavlan-7": "2001:660:4406:587:f::5",
+      "kavlan-8": "2001:660:4406:588:f::5",
+      "kavlan-9": "2001:660:4406:589:f::5"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.5",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::5",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:b9:c0",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-5.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/5"
+      "switch_port": "Ethernet1/1/5",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:b9:c1",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:5c",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:5d",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:5e",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:5f",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.5",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:27:56",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-5-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978e0026d92ce5083b9447",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978e0026d92ce50842b94a",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-5"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
index c2797ad18c7687e5d5a67d410f370ee9c3c43ef9..8310785cc34df74d72ecd518b2985116f1c118ec 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "62N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.6",
+      "kavlan-11": "10.7.222.6",
+      "kavlan-12": "10.11.222.6",
+      "kavlan-13": "10.15.222.6",
+      "kavlan-14": "10.19.222.6",
+      "kavlan-16": "10.27.222.6",
+      "kavlan-18": "10.35.222.6",
+      "kavlan-2": "192.168.222.6",
+      "kavlan-20": "10.43.222.6",
+      "kavlan-21": "10.47.222.6",
+      "kavlan-3": "192.168.238.6",
+      "kavlan-4": "10.16.14.6",
+      "kavlan-5": "10.16.78.6",
+      "kavlan-6": "10.16.142.6",
+      "kavlan-7": "10.16.206.6",
+      "kavlan-8": "10.17.14.6",
+      "kavlan-9": "10.17.78.6"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::6",
+      "kavlan-11": "2001:660:4406:58b:f::6",
+      "kavlan-12": "2001:660:4406:58c:f::6",
+      "kavlan-13": "2001:660:4406:58d:f::6",
+      "kavlan-14": "2001:660:4406:58e:f::6",
+      "kavlan-16": "2001:660:4406:590:f::6",
+      "kavlan-18": "2001:660:4406:592:f::6",
+      "kavlan-2": "2001:660:4406:582:f::6",
+      "kavlan-20": "2001:660:4406:594:f::6",
+      "kavlan-21": "2001:660:4406:595:f::6",
+      "kavlan-3": "2001:660:4406:583:f::6",
+      "kavlan-4": "2001:660:4406:584:f::6",
+      "kavlan-5": "2001:660:4406:585:f::6",
+      "kavlan-6": "2001:660:4406:586:f::6",
+      "kavlan-7": "2001:660:4406:587:f::6",
+      "kavlan-8": "2001:660:4406:588:f::6",
+      "kavlan-9": "2001:660:4406:589:f::6"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.6",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::6",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:64:a0",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-6.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/6"
+      "switch_port": "Ethernet1/1/6",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:64:a1",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:6c:10",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:6c:11",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:6c:12",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:6c:13",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.6",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:95:bc",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-6-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bd60026d92cbf084093bb",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bd60026d92cc008476f38",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-6"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
index 1ac0bc655e7e7472b4964971a1fa301fe7ddfdce..2272d0e10b6733a521bbc2fe3a001b545f963d34 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "J0N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.7",
+      "kavlan-11": "10.7.222.7",
+      "kavlan-12": "10.11.222.7",
+      "kavlan-13": "10.15.222.7",
+      "kavlan-14": "10.19.222.7",
+      "kavlan-16": "10.27.222.7",
+      "kavlan-18": "10.35.222.7",
+      "kavlan-2": "192.168.222.7",
+      "kavlan-20": "10.43.222.7",
+      "kavlan-21": "10.47.222.7",
+      "kavlan-3": "192.168.238.7",
+      "kavlan-4": "10.16.14.7",
+      "kavlan-5": "10.16.78.7",
+      "kavlan-6": "10.16.142.7",
+      "kavlan-7": "10.16.206.7",
+      "kavlan-8": "10.17.14.7",
+      "kavlan-9": "10.17.78.7"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::7",
+      "kavlan-11": "2001:660:4406:58b:f::7",
+      "kavlan-12": "2001:660:4406:58c:f::7",
+      "kavlan-13": "2001:660:4406:58d:f::7",
+      "kavlan-14": "2001:660:4406:58e:f::7",
+      "kavlan-16": "2001:660:4406:590:f::7",
+      "kavlan-18": "2001:660:4406:592:f::7",
+      "kavlan-2": "2001:660:4406:582:f::7",
+      "kavlan-20": "2001:660:4406:594:f::7",
+      "kavlan-21": "2001:660:4406:595:f::7",
+      "kavlan-3": "2001:660:4406:583:f::7",
+      "kavlan-4": "2001:660:4406:584:f::7",
+      "kavlan-5": "2001:660:4406:585:f::7",
+      "kavlan-6": "2001:660:4406:586:f::7",
+      "kavlan-7": "2001:660:4406:587:f::7",
+      "kavlan-8": "2001:660:4406:588:f::7",
+      "kavlan-9": "2001:660:4406:589:f::7"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.7",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::7",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:6a:b0",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-7.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/7"
+      "switch_port": "Ethernet1/1/7",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:6a:b1",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:04",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:05",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:06",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:81:07",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.7",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:8e:96",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-7-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97ab0026d92cde0835630c",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97ab0026d92cdf083c8655",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-7"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
index b1452cbb105d0a0a48c3833a4ff7dc7e7704413e..0d92a09b67d8a1c5f5075f84726d66e2ba78a43e 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "71N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.8",
+      "kavlan-11": "10.7.222.8",
+      "kavlan-12": "10.11.222.8",
+      "kavlan-13": "10.15.222.8",
+      "kavlan-14": "10.19.222.8",
+      "kavlan-16": "10.27.222.8",
+      "kavlan-18": "10.35.222.8",
+      "kavlan-2": "192.168.222.8",
+      "kavlan-20": "10.43.222.8",
+      "kavlan-21": "10.47.222.8",
+      "kavlan-3": "192.168.238.8",
+      "kavlan-4": "10.16.14.8",
+      "kavlan-5": "10.16.78.8",
+      "kavlan-6": "10.16.142.8",
+      "kavlan-7": "10.16.206.8",
+      "kavlan-8": "10.17.14.8",
+      "kavlan-9": "10.17.78.8"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::8",
+      "kavlan-11": "2001:660:4406:58b:f::8",
+      "kavlan-12": "2001:660:4406:58c:f::8",
+      "kavlan-13": "2001:660:4406:58d:f::8",
+      "kavlan-14": "2001:660:4406:58e:f::8",
+      "kavlan-16": "2001:660:4406:590:f::8",
+      "kavlan-18": "2001:660:4406:592:f::8",
+      "kavlan-2": "2001:660:4406:582:f::8",
+      "kavlan-20": "2001:660:4406:594:f::8",
+      "kavlan-21": "2001:660:4406:595:f::8",
+      "kavlan-3": "2001:660:4406:583:f::8",
+      "kavlan-4": "2001:660:4406:584:f::8",
+      "kavlan-5": "2001:660:4406:585:f::8",
+      "kavlan-6": "2001:660:4406:586:f::8",
+      "kavlan-7": "2001:660:4406:587:f::8",
+      "kavlan-8": "2001:660:4406:588:f::8",
+      "kavlan-9": "2001:660:4406:589:f::8"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.8",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::8",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:ac:40",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-8.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/8"
+      "switch_port": "Ethernet1/1/8",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:ac:41",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:65:cc",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:65:cd",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "f0:d4:e2:ec:65:ce",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f0:d4:e2:ec:65:cf",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.8",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:28:70",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-8-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978d0026d92cbe08374544",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978d0026d92cbf083e5ee5",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-8"
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
index dd7e84e5fd8d458e75f245750bf82458cf9aa1cf..00731dc78e7f857986701722bf378e227962eb01 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
@@ -1,9 +1,67 @@
 {
   "architecture": {
-    "nb_cores": 0
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 40,
+    "nb_procs": 2,
+    "nb_threads": 80,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/26/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.1"
+  },
+  "bmc_version": "4.22.00.00",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R640",
+    "serial": "52N3F53"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.206.9",
+      "kavlan-11": "10.7.222.9",
+      "kavlan-12": "10.11.222.9",
+      "kavlan-13": "10.15.222.9",
+      "kavlan-14": "10.19.222.9",
+      "kavlan-16": "10.27.222.9",
+      "kavlan-18": "10.35.222.9",
+      "kavlan-2": "192.168.222.9",
+      "kavlan-20": "10.43.222.9",
+      "kavlan-21": "10.47.222.9",
+      "kavlan-3": "192.168.238.9",
+      "kavlan-4": "10.16.14.9",
+      "kavlan-5": "10.16.78.9",
+      "kavlan-6": "10.16.142.9",
+      "kavlan-7": "10.16.206.9",
+      "kavlan-8": "10.17.14.9",
+      "kavlan-9": "10.17.78.9"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:581:f::9",
+      "kavlan-11": "2001:660:4406:58b:f::9",
+      "kavlan-12": "2001:660:4406:58c:f::9",
+      "kavlan-13": "2001:660:4406:58d:f::9",
+      "kavlan-14": "2001:660:4406:58e:f::9",
+      "kavlan-16": "2001:660:4406:590:f::9",
+      "kavlan-18": "2001:660:4406:592:f::9",
+      "kavlan-2": "2001:660:4406:582:f::9",
+      "kavlan-20": "2001:660:4406:594:f::9",
+      "kavlan-21": "2001:660:4406:595:f::9",
+      "kavlan-3": "2001:660:4406:583:f::9",
+      "kavlan-4": "2001:660:4406:584:f::9",
+      "kavlan-5": "2001:660:4406:585:f::9",
+      "kavlan-6": "2001:660:4406:586:f::9",
+      "kavlan-7": "2001:660:4406:587:f::9",
+      "kavlan-8": "2001:660:4406:588:f::9",
+      "kavlan-9": "2001:660:4406:589:f::9"
+    }
+  },
   "main_memory": {
+    "ram_size": 103079215104
   },
   "monitoring": {
     "wattmeter": "false"
@@ -11,43 +69,99 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "ip": "172.16.78.9",
-      "kavlan": false,
+      "ip6": "2001:660:4406:500:f::9",
+      "kavlan": true,
       "mac": "40:a6:b7:1b:6d:80",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": true,
       "mounted": true,
+      "name": "ens1f0",
       "network_address": "grappe-9.nancy.grid5000.fr",
+      "rate": 25000000000,
       "switch": "sgrappe",
-      "switch_port": "Ethernet1/1/9"
+      "switch_port": "Ethernet1/1/9",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "i40e",
       "enabled": false,
+      "firmware_version": "7.10 0x800075e6 19.5.12",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "40:a6:b7:1b:6d:81",
+      "management": false,
+      "model": "Ethernet Controller XXV710 for 25GbE SFP28",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens1f1",
+      "vendor": "Intel"
     },
     {
       "device": "eth2",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "34:48:ed:f2:b8:4c",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth3",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "34:48:ed:f2:b8:4d",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno2",
+      "vendor": "Broadcom"
     },
     {
       "device": "eth4",
+      "driver": "tg3",
       "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
       "kavlan": false,
+      "mac": "34:48:ed:f2:b8:4e",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "eno3",
+      "vendor": "Broadcom"
+    },
+    {
+      "device": "eth5",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.8 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "34:48:ed:f2:b8:4f",
+      "management": false,
+      "model": "NetXtreme BCM5720 Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno4",
+      "vendor": "Broadcom"
     },
     {
       "device": "bmc",
@@ -56,19 +170,39 @@
       "ip": "172.17.78.9",
       "kavlan": false,
       "mac": "2c:ea:7f:ef:00:32",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "grappe-9-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 33600000000,
-    "node_flops": 0
+    "node_flops": 1344000000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 28835840,
     "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Cascade Lake-SP",
-    "other_description": "Intel Xeon Gold 5218R"
+    "microcode": "0x5002f01",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 5218R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 5218R"
   },
   "sensors": {
   },
@@ -79,19 +213,25 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25b960026d92cdf08387140",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
       "device": "sda",
+      "firmware_version": 4.3,
       "interface": "SATA",
       "model": "PERC H330 Mini",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     },
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25b960026d92cdf083f33bb",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
       "device": "sdb",
+      "firmware_version": 4.3,
       "interface": "SAS",
       "model": "PERC H330 Mini",
       "reservation": true,
+      "size": 8000987201536,
       "storage": "HDD",
       "vendor": "Dell (Raid)"
     }
@@ -103,7 +243,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "grappe-9"
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index fd808b5d7dfbd8831ce85aa545f61e45fe1537fe..4e52b260b377c83bac7be6ec0ad1362bf607df88 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -107,6 +107,7 @@
           "uid": "grappe-16"
         }
       ],
+      "rate": 25000000000,
       "snmp_pattern": "Ethernet1/%LINECARD%/%PORT%"
     }
   ],
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index b854c8aacd1d1a6b4c5c9a6ce24802409fc57cc0..aa87739da062da89907fcdbb2a57903118758ce3 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -52,6 +52,7 @@ ipv4:
       nancy grcinq eth0 0 0 11 0
       nancy grvingt eth0 0 0 12 0
       nancy grue eth0 0 0 13 0
+      nancy grappe eth0 0 0 14 0
       nantes econome eth0 0 0 0 0
       nantes ecotype eth0 0 0 1 0
       nantes ecotype eth1 0 0 2 0
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
index 4eb3c1e22b09f9aa3b0bf7a16159abd8c1dae8e9..1c6aaec04605c9d31452a657cfd9ad49138e6a51 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
@@ -1,7 +1,7 @@
 ---
 model: Dell PowerEdge R640
 created_at: 2020-08-20
-kavlan: false
+kavlan: true
 queues:
   - admin
   - testing
@@ -48,6 +48,10 @@ nodes:
         enabled: false
         mountable: false
         mounted: false
+      eth5:
+        enabled: false
+        mountable: false
+        mounted: false
     storage_devices:
       sda:
         interface: SATA
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe_ip.yaml.erb b/input/grid5000/sites/nancy/clusters/grappe/grappe_ip.yaml.erb
deleted file mode 100644
index 1549d020c7a8ebe0acbb3b8bd3497ba56c5463d2..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe_ip.yaml.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-nodes:
-<% (1..16).each { |i| %>
-  grappe-<%= i %>:
-    network_adapters:
-      eth0:
-        mounted: true
-        ip: 172.16.78.<%= i %>
-        mac: <%= %w(
-                    40:A6:B7:1B:64:80
-                    40:A6:B7:1B:A9:D0
-                    40:A6:B7:1B:AB:50
-                    40:A6:B7:1B:B4:F0
-                    40:A6:B7:1B:B9:C0
-                    40:A6:B7:1B:64:A0
-                    40:A6:B7:1B:6A:B0
-                    40:A6:B7:1B:AC:40
-                    40:A6:B7:1B:6D:80
-                    40:A6:B7:1B:68:C0
-                    40:A6:B7:1B:6B:E0
-                    40:A6:B7:1B:6B:B0
-                    40:A6:B7:1B:69:10
-                    40:A6:B7:1B:6B:10
-                    40:A6:B7:1B:69:00
-                    40:A6:B7:1B:68:70
-                  )[i-1] %>
-      bmc:
-        ip: 172.17.78.<%= i %>
-        mac: <%= %w(
-                    2C:EA:7F:EF:31:16
-                    2C:EA:7F:EE:88:7A
-                    2C:EA:7F:EF:1D:FC
-                    2C:EA:7F:EF:32:60
-                    2C:EA:7F:EF:27:56
-                    2C:EA:7F:EF:95:BC
-                    2C:EA:7F:EF:8E:96
-                    2C:EA:7F:EF:28:70
-                    2C:EA:7F:EF:00:32
-                    2C:EA:7F:EF:92:50
-                    2C:EA:7F:EF:9E:02
-                    2C:EA:7F:EF:20:90
-                    2C:EA:7F:EE:F4:74
-                    2C:EA:7F:EF:93:16
-                    2C:EA:7F:EF:21:C2
-                    2C:EA:7F:EF:81:04
-                  )[i-1] %>
-<% } %>
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe_ipv6.yaml.erb b/input/grid5000/sites/nancy/clusters/grappe/grappe_ipv6.yaml.erb
deleted file mode 100644
index bf317fe718023f1c5c8797e499b98454004c3f65..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe_ipv6.yaml.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% (1..16).each do |index| %>
-  grappe-<%= index %>:
-    network_adapters:
-      eth0:
-        ip6: 2001:660:4406:500:f::<%= index.to_s(16) %>
-<% end %>
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 8931fee4eaab92e05621cae575a4526e60b8f6ac..b5592dde4b0cf92b62ead7eadf1f6c7c36188063 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -102,6 +102,7 @@ vlans:
       local nancy grele eth0 0 0 11 0
       local nancy graffiti eth2 0 0 12 0
       local nancy grue eth0 0 0 13 0
+      local nancy grappe eth0 0 0 14 0
       local nantes econome eth0 0 0 0 0
       local nantes ecotype eth0 0 0 1 0
       local nantes ecotype eth1 0 0 2 0
@@ -154,6 +155,7 @@ vlans:
       global nancy grimani eth0 0 0 27 0
       global nancy graffiti eth2 0 0 28 0
       global nancy grue eth0 0 0 29 0
+      global nancy grappe eth0 0 0 30 0
       global rennes paravance eth0 0 0 32 0
       global rennes paravance eth1 0 0 32 100
       global rennes parasilo eth0 0 0 33 0
@@ -208,6 +210,7 @@ vlans:
       routed nancy grele eth0 0 16 11 0
       routed nancy graffiti eth2 0 16 12 0
       routed nancy grue eth0 0 16 13 0
+      routed nancy grappe eth0 0 16 14 0
       routed rennes parapide eth0 0 24 0 0
       routed rennes parapluie eth1 0 24 1 0
       routed rennes paranoia eth0 0 24 2 0