diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
index e8d8b09fc0382a39f087903346d6e2537f66900f..c6bd04650f34156b44b36aed0ccbfb04cf563450 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.101",
+    "mac": "00:30:48:96:07:e5"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004740"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:7c86"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:7c87"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.1",
       "mac": "00:30:48:7c:7c:86",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-1-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.1",
-      "ip6": "fe80::230:48ff:fe7c:66ed",
       "mac": "00:30:48:7c:7c:87",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-1.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/1",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.101",
-      "ip6": "fe80::260:ddff:fe47:4bb6",
-      "mac": "00:60:dd:47:4b:b6",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-1-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.101",
-      "mac": "00:30:48:96:07:e5",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
index 0962cd0e0a3c8d6eb1fd27ce40cd5216a666afeb..7e30a5e7e3f020d0f3a252b1b1dbea87c2886df9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.110",
+    "mac": "00:30:48:94:2d:7a"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004760"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:8108"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:8109"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.10",
       "mac": "00:30:48:7c:81:08",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-10-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.10",
-      "ip6": "fe80::230:48ff:fe7c:8109",
       "mac": "00:30:48:7c:81:09",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-10.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/10",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.110",
-      "ip6": "fe80::260:ddff:fe47:4d35",
-      "mac": "00:60:dd:47:4d:35",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-10-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.110",
-      "mac": "00:30:48:94:2d:7a",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
index d0112336699dd83125c235fcb43393eac050f2a0..e0faab83397356ce3cfdd4a302fcb32b624f5a98 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.111",
+    "mac": "00:30:48:96:25:66"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004758"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:67b0"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:67b1"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.11",
       "mac": "00:30:48:7c:67:b0",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-11-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.11",
-      "ip6": "fe80::230:48ff:fe7c:67b1",
       "mac": "00:30:48:7c:67:b1",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-11.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/11",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.111",
-      "ip6": "fe80::260:ddff:fe47:4d30",
-      "mac": "00:60:dd:47:4d:30",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-11-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.111",
-      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
index e3b09f08475857193131c1881019c0619779942e..c06e702f238fd1dc2683cab52a857940031a89ab 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.112",
+    "mac": "00:30:48:96:25:6c"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004758"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:6eb8"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:6eb9"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.12",
       "mac": "00:30:48:7c:6e:b8",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-12-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.12",
-      "ip6": "fe80::230:48ff:fe7c:6eb9",
       "mac": "00:30:48:7c:6e:b9",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-12.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/12",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.112",
-      "ip6": "fe80::260:ddff:fe47:4c6c",
-      "mac": "00:60:dd:47:4c:6c",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-12-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.112",
-      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
index adf8bb6faf5acb4f7409115a7c6f1a467a1475b2..c147dac20250013ad4ea0101ff59256e3edcd402 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.113",
+    "mac": "00:30:48:94:36:4c"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004757"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:86"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:87"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.13",
       "mac": "00:30:48:7c:00:86",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-13-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.13",
-      "ip6": "fe80::230:48ff:fe7c:87",
       "mac": "00:30:48:7c:00:87",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-13.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/13",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.113",
-      "ip6": "fe80::260:ddff:fe47:498d",
-      "mac": "00:60:dd:47:49:8d",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-13-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.113",
-      "mac": "00:30:48:94:36:4c",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
index c42c51a2035f8e8b4cec651e64105788da5cd461..91b9130dadd7350337047d75b47772e8e4723a38 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.114",
+    "mac": "00:30:48:94:35:de"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004757"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:74"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:75"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.14",
       "mac": "00:30:48:7c:00:74",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-14-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.14",
-      "ip6": "fe80::230:48ff:fe7c:75",
       "mac": "00:30:48:7c:00:75",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-14.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": null,
       "switch_port": null,
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.114",
-      "ip6": "fe80::260:ddff:fe47:498a",
-      "mac": "00:60:dd:47:49:8a",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-14-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.114",
-      "mac": "00:30:48:94:35:de",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
index 76b56dc7ed684c1d2c0d8da565518b451c000a7f..21f722cc657fb6f02fbb9aaf3ca46754aa47c689 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.115",
+    "mac": "00:30:48:96:25:b9"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004741"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:7f9e"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:7f9f"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.15",
       "mac": "00:30:48:7c:7f:9e",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-15-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.15",
-      "ip6": "fe80::230:48ff:fe7c:7f9f",
       "mac": "00:30:48:7c:7f:9f",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-15.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/15",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.115",
-      "ip6": "fe80::260:ddff:fe47:499c",
-      "mac": "00:60:dd:47:49:9c",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-15-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.115",
-      "mac": "00:30:48:96:25:b9",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
index 2169d662d0155f0f9a5ac4362ee492d36a31bd7f..85082f1fa0fe4f9228abc45ec24f0a6c52a8a9f7 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.116",
+    "mac": "00:30:48:96:24:e1"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004741"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:80fe"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:80ff"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.16",
       "mac": "00:30:48:7c:80:fe",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-16-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.16",
-      "ip6": "fe80::230:48ff:fe7c:80ff",
       "mac": "00:30:48:7c:80:ff",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-16.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/16",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.116",
-      "ip6": "fe80::260:ddff:fe47:4d32",
-      "mac": "00:60:dd:47:4d:32",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-16-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.116",
-      "mac": "00:30:48:96:24:e1",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
index 1bab3ee604052d6ec56fa18e7692b0041864cf30..81f27da158c3281d785e91fa161d9c41e7991379 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.117",
+    "mac": "00:30:48:96:26:5a"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004746"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:6f5c"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:6f5d"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.17",
       "mac": "00:30:48:7c:6f:5c",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-17-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.17",
-      "ip6": "fe80::230:48ff:fe7c:66ed",
       "mac": "00:30:48:7c:6f:5d",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-17.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/17",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.117",
-      "ip6": "fe80::260:ddff:fe47:4985",
-      "mac": "00:60:dd:47:49:85",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-17-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.117",
-      "mac": "00:30:48:96:26:5a",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
index 3f7d7701642a053a483c337f3b77cc74492b07c4..aab65f87a8680079ba5b1c97264045487ab19cea 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.118",
+    "mac": "00:30:48:96:25:76"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004746"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:67de"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:67df"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.18",
       "mac": "00:30:48:7c:67:de",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-18-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.18",
-      "ip6": "fe80::230:48ff:fe7c:66ed",
       "mac": "00:30:48:7c:67:df",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-18.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/18",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.118",
-      "ip6": "fe80::260:ddff:fe47:4d31",
-      "mac": "00:60:dd:47:4d:31",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-18-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.118",
-      "mac": "00:30:48:96:25:76",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
index 914a7a3716469cca72b36fa939c42565b532b4d4..b4d8bb15c4bac02e2e3bed6434c345cf1ea540d3 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.119",
+    "mac": "00:30:48:96:25:de"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004748"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:6f0c"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:6f0d"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.19",
       "mac": "00:30:48:7c:6f:0c",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-19-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.19",
-      "ip6": "fe80::230:48ff:fe7c:6f0d",
       "mac": "00:30:48:7c:6f:0d",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-19.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/19",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.119",
-      "ip6": "fe80::260:ddff:fe47:49eb",
-      "mac": "00:60:dd:47:49:eb",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-19-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.119",
-      "mac": "00:30:48:96:25:de",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
index b3e85ab7f580c3d0766d08e561f6109c1fc9b711..864c0bdb6f4f6e113a42dca545f8edfe4e9f3e53 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.102",
+    "mac": "00:30:48:96:25:67"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004740"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:7f22"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:7f23"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.2",
       "mac": "00:30:48:7c:7f:22",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-2-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.2",
-      "ip6": "fe80::230:48ff:fe7c:7f23",
       "mac": "00:30:48:7c:7f:23",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-2.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/2",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.102",
-      "ip6": "fe80::260:ddff:fe47:4bb8",
-      "mac": "00:60:dd:47:4b:b8",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-2-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.102",
-      "mac": "00:30:48:96:25:67",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
index b67b9b53ce3e12b90a72071ead711dfd9eeec33a..7d9d6ce035207ee5f0a527f9dc571925b095389d 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.120",
+    "mac": "00:30:48:96:25:c7"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004748"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:67bc"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:67bd"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.20",
       "mac": "00:30:48:7c:67:bc",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-20-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.20",
-      "ip6": "fe80::230:48ff:fe7c:66ed",
       "mac": "00:30:48:7c:67:bd",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-20.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/20",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.120",
-      "ip6": "fe80::260:ddff:fe47:4986",
-      "mac": "00:60:dd:47:49:86",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-20-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.120",
-      "mac": "00:30:48:96:25:c7",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
index 1041e2ae065be2ab745cfeaf0822536bab882ed8..fd60b2e66661bfe32925d393989585dabacb90e5 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.121",
+    "mac": "00:30:48:94:4a:34"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X1------"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:70a6"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:70a7"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.21",
       "mac": "00:30:48:7c:70:a6",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-21-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.21",
-      "ip6": "fe80::230:48ff:fe7c:70a7",
       "mac": "00:30:48:7c:70:a7",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-21.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/21",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.121",
-      "ip6": "fe80::260:ddff:fe47:49ee",
-      "mac": "00:60:dd:47:49:ee",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-21-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.121",
-      "mac": "00:30:48:94:4a:34",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
index 694b691da7092b682ce1a1154952264d51adf676..0b86535a024f977f416914dbe55ecdcfff583250 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.122",
+    "mac": "00:30:48:94:4b:02"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004739"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:3dda"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:3ddb"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.22",
       "mac": "00:30:48:7c:3d:da",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-22-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.22",
-      "ip6": "fe80::230:48ff:fe7c:3ddb",
       "mac": "00:30:48:7c:3d:db",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-22.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/22",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.122",
-      "ip6": "fe80::260:ddff:fe47:49e3",
-      "mac": "00:60:dd:47:49:e3",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-22-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.122",
-      "mac": "00:30:48:94:4b:02",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
index bb553ed82e9b9dce4831d9c1291fe52c520165a3..89aeba5393dcfc9bad84f21f87bfb21f6e652e1f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.124",
+    "mac": "00:30:48:94:2d:76"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004752"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:80e8"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:80e9"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.24",
       "mac": "00:30:48:7c:80:e8",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-24-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.24",
-      "ip6": "fe80::230:48ff:fe7c:80e9",
       "mac": "00:30:48:7c:80:e9",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-24.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/24",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.124",
-      "ip6": "fe80::260:ddff:fe47:49f1",
-      "mac": "00:60:dd:47:49:f1",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-24-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.124",
-      "mac": "00:30:48:94:2d:76",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
index c67fc857a427ed045bf83e7f6596edc76ee8fb2f..2d94294a7978af9197f960128df4eac25eaf0f58 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.125",
+    "mac": "00:30:48:9b:1a:cf"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004755"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:810a"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:810b"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.25",
       "mac": "00:30:48:7c:81:0a",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-25-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.25",
-      "ip6": "fe80::230:48ff:fe7c:810b",
       "mac": "00:30:48:7c:81:0b",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-25.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/25",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.125",
-      "ip6": "fe80::260:ddff:fe47:4cdd",
-      "mac": "00:60:dd:47:4c:dd",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-25-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.125",
-      "mac": "00:30:48:9b:1a:cf",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
index e4b9a523d3873ce68b7600b9c3580486808733bf..274d40039f240b27cc3137077e506998ed9fd4bb 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.126",
+    "mac": "00:30:48:96:26:54"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004755"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:80ea"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:80eb"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.26",
       "mac": "00:30:48:7c:80:ea",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-26-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.26",
-      "ip6": "fe80::230:48ff:fe7c:80eb",
       "mac": "00:30:48:7c:80:eb",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-26.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/26",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.126",
-      "ip6": "fe80::260:ddff:fe47:4bab",
-      "mac": "00:60:dd:47:4b:ab",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-26-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.126",
-      "mac": "00:30:48:96:26:54",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
index e5901a00011effc08aee0e8e7a5fe143ae6b92f1..a2d155280fafe009dcde20dc713212326f58ce22 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.127",
+    "mac": "00:30:48:96:25:63"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004747"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:6eb4"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:6eb5"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.27",
       "mac": "00:30:48:7c:6e:b4",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-27-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.27",
-      "ip6": "fe80::230:48ff:fe7c:6eb5",
       "mac": "00:30:48:7c:6e:b5",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-27.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/27",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.127",
-      "ip6": "fe80::260:ddff:fe47:49ec",
-      "mac": "00:60:dd:47:49:ec",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-27-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.127",
-      "mac": "00:30:48:96:25:63",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
index 9d22a08fba83f253640a0c676541d925aea9fb7b..a8f9e782a5b111769ed304f84559656ccd03a4c8 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.128",
+    "mac": "00:30:48:96:26:b2"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004747"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:6eda"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:6edb"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.28",
       "mac": "00:30:48:7c:6e:da",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-28-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.28",
-      "ip6": "fe80::230:48ff:fe7c:6edb",
       "mac": "00:30:48:7c:6e:db",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-28.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/28",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.128",
-      "ip6": "fe80::260:ddff:fe47:49e5",
-      "mac": "00:60:dd:47:49:e5",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-28-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.128",
-      "mac": "00:30:48:96:26:b2",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
index 2ed9c098c783f57713a75b838d49c0d839f9292d..fa78ed1ac00ecdfeb13f6e2d246bf55cc80d9517 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.129",
+    "mac": "00:30:48:94:37:d3"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004753"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:812a"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:812b"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.29",
       "mac": "00:30:48:7c:81:2a",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-29-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.29",
-      "ip6": "fe80::230:48ff:fe7c:812b",
       "mac": "00:30:48:7c:81:2b",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-29.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/29",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.129",
-      "ip6": "fe80::260:ddff:fe47:4d45",
-      "mac": "00:60:dd:47:4d:45",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-29-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.129",
-      "mac": "00:30:48:94:37:d3",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
index 5ab86897a60233854194c3cc53e8ea7e8a47fb16..dbb39a139deae57668e74ff38962390fb360656e 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.103",
+    "mac": "00:30:48:94:4a:7e"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004742"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7b:fd0e"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7b:fd0f"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.3",
       "mac": "00:30:48:7b:fd:0e",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-3-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.3",
-      "ip6": "fe80::230:48ff:fe7b:fd0f",
       "mac": "00:30:48:7b:fd:0f",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-3.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/3",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.103",
-      "ip6": "fe80::260:ddff:fe47:4cbb",
-      "mac": "00:60:dd:47:4c:bb",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-3-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.103",
-      "mac": "00:30:48:94:4a:7e",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
index bbf9057ef0eb22f52f67cf28cdb3a12ff8550ba8..b9aed58e2d280ef8a5faf879e99464608bce4bae 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.130",
+    "mac": "00:30:48:94:37:8b"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004753"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:bbfa"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:bbfb"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.30",
       "mac": "00:30:48:7c:bb:fa",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-30-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.30",
-      "ip6": "fe80::230:48ff:fe7c:bbfb",
       "mac": "00:30:48:7c:bb:fb",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-30.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/30",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.130",
-      "ip6": "fe80::260:ddff:fe47:4bb0",
-      "mac": "00:60:dd:47:4b:b0",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-30-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.130",
-      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
index 481ba7965057bb92e8674babc549ddf98dbe0614..f723197100e73c4d4950be7d60251cf29625fd1b 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.131",
+    "mac": "00:30:48:96:24:e6"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004759"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7b:f97a"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7b:f97b"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.31",
       "mac": "00:30:48:7b:f9:7a",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-31-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.31",
-      "ip6": "fe80::230:48ff:fe7b:f97b",
       "mac": "00:30:48:7b:f9:7b",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-31.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/31",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.131",
-      "ip6": "fe80::260:ddff:fe47:49e1",
-      "mac": "00:60:dd:47:49:e1",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-31-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.131",
-      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
index e16039dbcd9bd0447e296af5021443fafcf8201c..634a86316c5378e6b7e03867fa16386b3da95b08 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.132",
+    "mac": "00:30:48:96:25:26"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004759"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7b:f976"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7b:f977"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.32",
       "mac": "00:30:48:7b:f9:76",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-32-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.32",
-      "ip6": "fe80::230:48ff:fe7b:f977",
       "mac": "00:30:48:7b:f9:77",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-32.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/32",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.132",
-      "ip6": "fe80::260:ddff:fe47:49e9",
-      "mac": "00:60:dd:47:49:e9",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-32-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.132",
-      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
index e0d965c3a10c02bd7e074504f51983ac43a0f790..70d31e690c6946b5e96c7e553f2fa9f3ef35ce56 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.134",
+    "mac": "00:30:48:94:38:87"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004754"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7a:5f16"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7a:5f17"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.34",
       "mac": "00:30:48:7a:5f:16",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-34-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.34",
-      "ip6": "fe80::230:48ff:fe7a:5f17",
       "mac": "00:30:48:7a:5f:17",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-34.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/34",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.134",
-      "ip6": "fe80::260:ddff:fe47:49b8",
-      "mac": "00:60:dd:47:49:b8",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-34-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.134",
-      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
index 264caaea7577bf3eb1754cb6d719e80eef5760e4..6794f5fadf40002dd7160c51e057c0c84917ce07 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.135",
+    "mac": "00:30:48:95:4b:b7"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004743"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:3df4"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:3df5"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.35",
       "mac": "00:30:48:7c:3d:f4",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-35-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.35",
-      "ip6": "fe80::230:48ff:fe7c:3df5",
       "mac": "00:30:48:7c:3d:f5",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-35.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/35",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.135",
-      "ip6": "fe80::260:ddff:fe47:49e2",
-      "mac": "00:60:dd:47:49:e2",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-35-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.135",
-      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
index b87e459914fb775b0dda93843c66ca6944feb5ac..e4339454fa44c121bacccfcd4feee080313550bc 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.137",
+    "mac": "00:30:48:94:36:15"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004751"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:8104"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:8105"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.37",
       "mac": "00:30:48:7c:81:04",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-37-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.37",
-      "ip6": "fe80::230:48ff:fe7c:8105",
       "mac": "00:30:48:7c:81:05",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-37.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/37",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.137",
-      "ip6": "fe80::260:ddff:fe47:49e4",
-      "mac": "00:60:dd:47:49:e4",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-37-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.137",
-      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
index 880c42d5e6c59260610c4b166b7230af29e2f634..f5cf6b3e72f74ded23c0294aa38c490271a27b02 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.138",
+    "mac": "00:30:48:94:1c:9a"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004751"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:7c80"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:7c81"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.38",
       "mac": "00:30:48:7c:7c:80",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-38-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.38",
-      "ip6": "fe80::230:48ff:fe7c:7c81",
       "mac": "00:30:48:7c:7c:81",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-38.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/38",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.138",
-      "ip6": "fe80::260:ddff:fe47:4bb2",
-      "mac": "00:60:dd:47:4b:b2",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-38-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.138",
-      "mac": "00:30:48:94:1c:9a",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
index 209b4ce7395b44e974cae35a39bf110c4d17d146..a95227a60e09f959d68e9edf4a85e1553b8376e5 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.139",
+    "mac": "00:30:48:94:2f:6e"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004738"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7d:f14"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7d:f15"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.39",
       "mac": "00:30:48:7d:0f:14",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-39-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.39",
-      "ip6": "fe80::230:48ff:fe7d:f15",
       "mac": "00:30:48:7d:0f:15",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-39.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet3/1",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.139",
-      "ip6": "fe80::260:ddff:fe47:4bb1",
-      "mac": "00:60:dd:47:4b:b1",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-39-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.139",
-      "mac": "00:30:48:94:2f:6e",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
index c15f9f804fd126430797a8949b563db7d18d2474..aa3ba01bf91831dc02ff6b817cd5d1b13ed868e8 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.104",
+    "mac": "00:30:48:94:44:21"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004742"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7d:2f1a"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7d:2f1b"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.4",
       "mac": "00:30:48:7d:2f:1a",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-4-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.4",
-      "ip6": "fe80::230:48ff:fe7d:2f1b",
       "mac": "00:30:48:7d:2f:1b",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-4.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/4",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.104",
-      "ip6": "fe80::260:ddff:fe47:4cb8",
-      "mac": "00:60:dd:47:4c:b8",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-4-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.104",
-      "mac": "00:30:48:94:44:21",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
index f1926324745e45e1ef85e4f43130bf6eb3631592..90f12708c00ea2a612f89267842af04d102d51c4 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.140",
+    "mac": "00:30:48:94:4b:4c"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004738"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7d:3574"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7d:3575"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.40",
       "mac": "00:30:48:7d:35:74",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-40-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.40",
-      "ip6": "fe80::230:48ff:fe7c:66ed",
       "mac": "00:30:48:7d:35:75",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-40.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet3/2",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.140",
-      "ip6": "fe80::260:ddff:fe47:4baf",
-      "mac": "00:60:dd:47:4b:af",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-40-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.140",
-      "mac": "00:30:48:94:4b:4c",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
index 2cca733a9066bdef2650b78f57c5581a22755857..4653e45afed7f0743672bc418157e5e837214397 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.141",
+    "mac": "00:30:48:96:07:ef"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004756"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7a:5bde"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7a:5bdf"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.41",
       "mac": "00:30:48:7a:5b:de",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-41-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.41",
-      "ip6": "fe80::230:48ff:fe7a:5bdf",
       "mac": "00:30:48:7a:5b:df",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-41.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet3/3",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.141",
-      "ip6": "fe80::260:ddff:fe47:4d48",
-      "mac": "00:60:dd:47:4d:48",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-41-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.141",
-      "mac": "00:30:48:96:07:ef",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
index 35324317bfdef8caa02e831bed85ca163ce5bbd0..58cc91680b7e33dfa949cbf8b1c7563d546bf529 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.142",
+    "mac": "00:30:48:96:07:f1"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004756"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7a:5ce4"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7a:5ce5"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.42",
       "mac": "00:30:48:7a:5c:e4",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-42-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.42",
-      "ip6": "fe80::230:48ff:fe7a:5ce5",
       "mac": "00:30:48:7a:5c:e5",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-42.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet3/4",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.142",
-      "ip6": "fe80::260:ddff:fe47:4cc0",
-      "mac": "00:60:dd:47:4c:c0",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-42-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.142",
-      "mac": "00:30:48:96:07:f1",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
index 347cdd5ca62187b068257067bdede1dc5e09b26e..616481373aedc1d009bf0b2a4b9f16b29b899518 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.143",
+    "mac": "00:30:48:96:25:e1"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004750"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:6ee8"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:6ee9"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.43",
       "mac": "00:30:48:7c:6e:e8",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-43-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.43",
-      "ip6": "fe80::230:48ff:fe7c:6ee9",
       "mac": "00:30:48:7c:6e:e9",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-43.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet3/5",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.143",
-      "ip6": "fe80::260:ddff:fe47:4bba",
-      "mac": "00:60:dd:47:4b:ba",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-43-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.143",
-      "mac": "00:30:48:96:25:e1",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
index 5810020e14e69c3b5a3898d495c5c053eb855e26..3edfae4cf7b27b8a8ba6ac88e47e9af9664f07d1 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.144",
+    "mac": "00:30:48:96:25:d1"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004750"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:66ec"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:66ed"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.44",
       "mac": "00:30:48:7c:66:ec",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-44-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.44",
-      "ip6": "fe80::230:48ff:fe7c:66ed",
       "mac": "00:30:48:7c:66:ed",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-44.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet3/6",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.144",
-      "ip6": "fe80::260:ddff:fe47:4bb6",
-      "mac": "00:60:dd:47:4b:b6",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-44-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.144",
-      "mac": "00:30:48:96:25:d1",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
index eac3054c535f7475e108cb51f60de0439ac66b9a..7ac7736997491e0eb6c079f9d49a5dd281506b8d 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.145",
+    "mac": "00:30:48:96:25:65"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004749"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:70a0"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:70a1"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.45",
       "mac": "00:30:48:7c:70:a0",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-45-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.45",
-      "ip6": "fe80::230:48ff:fe7c:70a1",
       "mac": "00:30:48:7c:70:a1",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-45.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet3/7",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.145",
-      "ip6": "fe80::260:ddff:fe47:4bb4",
-      "mac": "00:60:dd:47:4b:b4",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-45-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.145",
-      "mac": "00:30:48:96:25:65",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
index 809f76ec6ddaf9088ab1d13fb101ff36085db9e0..00a01b7765548d43b3f620f1f62ce39e6e88c60b 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.105",
+    "mac": "00:30:48:96:25:dd"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004745"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:6ebe"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:6ebf"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.5",
       "mac": "00:30:48:7c:6e:be",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-5-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.5",
-      "ip6": "fe80::230:48ff:fe7c:6ebf",
       "mac": "00:30:48:7c:6e:bf",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-5.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": null,
       "switch_port": null,
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.105",
-      "ip6": "fe80::260:ddff:fe47:49e7",
-      "mac": "00:60:dd:47:49:e7",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-5-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.105",
-      "mac": "00:30:48:96:25:dd",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
index 20bdad511735fadb6168a2f387bbd3f7b94e327e..af36ded5abdf326af36a4a1b58ae45ba52bc47aa 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.106",
+    "mac": "00:30:48:96:25:e0"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004745"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:6ebc"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:6ebd"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.6",
       "mac": "00:30:48:7c:6e:bc",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-6-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.6",
-      "ip6": "fe80::230:48ff:fe7c:6ebd",
       "mac": "00:30:48:7c:6e:bd",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-6.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/6",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.106",
-      "ip6": "fe80::260:ddff:fe47:49cb",
-      "mac": "00:60:dd:47:49:cb",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-6-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.106",
-      "mac": "00:30:48:96:25:e0",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
index 00152f2e22a058f309f4f14230abe1289d5ba275..35154ae99e4161a4b3912fa2551c010e1785ae67 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.107",
+    "mac": "00:30:48:96:07:fa"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004744"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:3dd4"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:3dd5"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.7",
       "mac": "00:30:48:7c:3d:d4",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-7-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.7",
-      "ip6": "fe80::230:48ff:fe7c:3dd5",
       "mac": "00:30:48:7c:3d:d5",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-7.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/7",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.107",
-      "ip6": "fe80::260:ddff:fe47:4cd5",
-      "mac": "00:60:dd:47:4c:d5",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-7-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.107",
-      "mac": "00:30:48:96:07:fa",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
index 4db52f6c0dd83e6cdd44baca4f386c6db0c74c97..869b25b666db5d3592c8e19f9be4a6581f4c2e13 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
@@ -9,16 +9,26 @@
     "vendor": "Phoenix Technologies LTD",
     "version": 6.0
   },
+  "bmc": {
+    "ip": "172.17.34.109",
+    "mac": "00:30:48:94:1b:e2"
+  },
   "chassis": {
     "manufacturer": "SGI.COM",
     "name": "AltixXE310",
     "serial": "X0004760"
   },
+  "eth0": {
+    "ip6": "fe80::230:48ff:fe7c:8106"
+  },
+  "eth1": {
+    "ip6": "fe80::230:48ff:fe7c:8107"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 8393850880,
+    "ram_size": 8391753728,
     "virtual_size": null
   },
   "monitoring": {
@@ -29,15 +39,10 @@
       "bridged": false,
       "device": "eth0",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.9",
       "mac": "00:30:48:7c:81:06",
       "management": false,
-      "mountable": true,
       "mounted": false,
-      "network_address": "chinqchint-9-eth0.lille.grid5000.fr",
-      "rate": 1000000000,
       "switch": "gw-lille",
       "vendor": "Intel",
       "version": "80003ES2LAN"
@@ -46,15 +51,11 @@
       "bridged": true,
       "device": "eth1",
       "driver": "e1000e",
-      "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.34.9",
-      "ip6": "fe80::230:48ff:fe7c:8107",
       "mac": "00:30:48:7c:81:07",
       "management": false,
-      "mountable": true,
       "mounted": true,
-      "network_address": "chinqchint-9.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
       "switch_port": "GigabitEthernet4/9",
@@ -63,17 +64,8 @@
     },
     {
       "device": "myri0",
-      "driver": "mx ethernet (myri)",
-      "enabled": false,
-      "interface": "Myrinet",
-      "ip": "172.18.47.109",
-      "ip6": "fe80::260:ddff:fe47:4c6f",
-      "mac": "00:60:dd:47:4c:6f",
       "management": false,
-      "mountable": true,
-      "mounted": false,
       "network_address": "chinqchint-9-myri0.lille.grid5000.fr",
-      "rate": 10000000000,
       "switch": "switch-myri",
       "vendor": "Myricom",
       "version": "10G-PCIE-8A-C"
@@ -82,8 +74,6 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.34.109",
-      "mac": "00:30:48:94:1b:e2",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
index 70859bdf757fce9cfb7d3572871cce92a7b4922e..26ff2b8ab1ff3ac29064ba269f19296cb77d5766 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
@@ -9,6 +9,17 @@ nodes:
 
 # Global node properties
   chinqchint-[1-46]:
+    processor:
+      model: Intel Xeon
+      cache_l1d: 32768
+      clock_speed: 2830000000
+      other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
+      version: E5440
+      cache_l2: 6291456
+      cache_l3: 0
+      vendor: Intel
+      instruction_set: x86-64
+      cache_l1i: 32768
     performance:
         core_flops: 8695000000
         node_flops: 52250000000
@@ -40,6 +51,7 @@ nodes:
         bridged: true
         vendor: Intel
         version: 80003ES2LAN
+        switch: gw-lille
       myri0:
         vendor: Myricom
         version: 10G-PCIE-8A-C
@@ -56,3 +68,414 @@ nodes:
       gpu: false
     monitoring:
       wattmeter: false
+
+  chinqchint-1:
+    bmc:
+      ip: 172.17.34.101
+      mac: 00:30:48:96:07:e5
+    eth0:
+      ip6: fe80::230:48ff:fe7c:7c86
+    eth1:
+      ip6: fe80::230:48ff:fe7c:7c87
+    chassis:
+      serial: X0004740
+  chinqchint-10:
+    bmc:
+      ip: 172.17.34.110
+      mac: 00:30:48:94:2d:7a
+    eth0:
+      ip6: fe80::230:48ff:fe7c:8108
+    eth1:
+      ip6: fe80::230:48ff:fe7c:8109
+    chassis:
+      serial: X0004760
+  chinqchint-11:
+    bmc:
+      ip: 172.17.34.111
+      mac: 00:30:48:96:25:66
+    eth0:
+      ip6: fe80::230:48ff:fe7c:67b0
+    eth1:
+      ip6: fe80::230:48ff:fe7c:67b1
+    chassis:
+      serial: X0004758
+  chinqchint-12:
+    bmc:
+      ip: 172.17.34.112
+      mac: 00:30:48:96:25:6c
+    eth0:
+      ip6: fe80::230:48ff:fe7c:6eb8
+    eth1:
+      ip6: fe80::230:48ff:fe7c:6eb9
+    chassis:
+      serial: X0004758
+  chinqchint-13:
+    bmc:
+      ip: 172.17.34.113
+      mac: 00:30:48:94:36:4c
+    eth0:
+      ip6: fe80::230:48ff:fe7c:86
+    eth1:
+      ip6: fe80::230:48ff:fe7c:87
+    chassis:
+      serial: X0004757
+  chinqchint-14:
+    bmc:
+      ip: 172.17.34.114
+      mac: 00:30:48:94:35:de
+    eth0:
+      ip6: fe80::230:48ff:fe7c:74
+    eth1:
+      ip6: fe80::230:48ff:fe7c:75
+    chassis:
+      serial: X0004757
+  chinqchint-15:
+    bmc:
+      ip: 172.17.34.115
+      mac: 00:30:48:96:25:b9
+    eth0:
+      ip6: fe80::230:48ff:fe7c:7f9e
+    eth1:
+      ip6: fe80::230:48ff:fe7c:7f9f
+    chassis:
+      serial: X0004741
+  chinqchint-16:
+    bmc:
+      ip: 172.17.34.116
+      mac: 00:30:48:96:24:e1
+    eth0:
+      ip6: fe80::230:48ff:fe7c:80fe
+    eth1:
+      ip6: fe80::230:48ff:fe7c:80ff
+    chassis:
+      serial: X0004741
+  chinqchint-17:
+    bmc:
+      ip: 172.17.34.117
+      mac: 00:30:48:96:26:5a
+    eth0:
+      ip6: fe80::230:48ff:fe7c:6f5c
+    eth1:
+      ip6: fe80::230:48ff:fe7c:6f5d
+    chassis:
+      serial: X0004746
+  chinqchint-18:
+    bmc:
+      ip: 172.17.34.118
+      mac: 00:30:48:96:25:76
+    eth0:
+      ip6: fe80::230:48ff:fe7c:67de
+    eth1:
+      ip6: fe80::230:48ff:fe7c:67df
+    chassis:
+      serial: X0004746
+  chinqchint-19:
+    bmc:
+      ip: 172.17.34.119
+      mac: 00:30:48:96:25:de
+    eth0:
+      ip6: fe80::230:48ff:fe7c:6f0c
+    eth1:
+      ip6: fe80::230:48ff:fe7c:6f0d
+    chassis:
+      serial: X0004748
+  chinqchint-2:
+    bmc:
+      ip: 172.17.34.102
+      mac: 00:30:48:96:25:67
+    eth0:
+      ip6: fe80::230:48ff:fe7c:7f22
+    eth1:
+      ip6: fe80::230:48ff:fe7c:7f23
+    chassis:
+      serial: X0004740
+  chinqchint-20:
+    bmc:
+      ip: 172.17.34.120
+      mac: 00:30:48:96:25:c7
+    eth0:
+      ip6: fe80::230:48ff:fe7c:67bc
+    eth1:
+      ip6: fe80::230:48ff:fe7c:67bd
+    chassis:
+      serial: X0004748
+  chinqchint-21:
+    bmc:
+      ip: 172.17.34.121
+      mac: 00:30:48:94:4a:34
+    eth0:
+      ip6: fe80::230:48ff:fe7c:70a6
+    eth1:
+      ip6: fe80::230:48ff:fe7c:70a7
+    chassis:
+      serial: X1------
+  chinqchint-22:
+    bmc:
+      ip: 172.17.34.122
+      mac: 00:30:48:94:4b:02
+    eth0:
+      ip6: fe80::230:48ff:fe7c:3dda
+    eth1:
+      ip6: fe80::230:48ff:fe7c:3ddb
+    chassis:
+      serial: X0004739
+  chinqchint-24:
+    bmc:
+      ip: 172.17.34.124
+      mac: 00:30:48:94:2d:76
+    eth0:
+      ip6: fe80::230:48ff:fe7c:80e8
+    eth1:
+      ip6: fe80::230:48ff:fe7c:80e9
+    chassis:
+      serial: X0004752
+  chinqchint-25:
+    bmc:
+      ip: 172.17.34.125
+      mac: 00:30:48:9b:1a:cf
+    eth0:
+      ip6: fe80::230:48ff:fe7c:810a
+    eth1:
+      ip6: fe80::230:48ff:fe7c:810b
+    chassis:
+      serial: X0004755
+  chinqchint-26:
+    bmc:
+      ip: 172.17.34.126
+      mac: 00:30:48:96:26:54
+    eth0:
+      ip6: fe80::230:48ff:fe7c:80ea
+    eth1:
+      ip6: fe80::230:48ff:fe7c:80eb
+    chassis:
+      serial: X0004755
+  chinqchint-27:
+    bmc:
+      ip: 172.17.34.127
+      mac: 00:30:48:96:25:63
+    eth0:
+      ip6: fe80::230:48ff:fe7c:6eb4
+    eth1:
+      ip6: fe80::230:48ff:fe7c:6eb5
+    chassis:
+      serial: X0004747
+  chinqchint-28:
+    bmc:
+      ip: 172.17.34.128
+      mac: 00:30:48:96:26:b2
+    eth0:
+      ip6: fe80::230:48ff:fe7c:6eda
+    eth1:
+      ip6: fe80::230:48ff:fe7c:6edb
+    chassis:
+      serial: X0004747
+  chinqchint-29:
+    bmc:
+      ip: 172.17.34.129
+      mac: 00:30:48:94:37:d3
+    eth0:
+      ip6: fe80::230:48ff:fe7c:812a
+    eth1:
+      ip6: fe80::230:48ff:fe7c:812b
+    chassis:
+      serial: X0004753
+  chinqchint-3:
+    bmc:
+      ip: 172.17.34.103
+      mac: 00:30:48:94:4a:7e
+    eth0:
+      ip6: fe80::230:48ff:fe7b:fd0e
+    eth1:
+      ip6: fe80::230:48ff:fe7b:fd0f
+    chassis:
+      serial: X0004742
+  chinqchint-30:
+    bmc:
+      ip: 172.17.34.130
+      mac: 00:30:48:94:37:8b
+    eth0:
+      ip6: fe80::230:48ff:fe7c:bbfa
+    eth1:
+      ip6: fe80::230:48ff:fe7c:bbfb
+    chassis:
+      serial: X0004753
+  chinqchint-31:
+    bmc:
+      ip: 172.17.34.131
+      mac: 00:30:48:96:24:e6
+    eth0:
+      ip6: fe80::230:48ff:fe7b:f97a
+    eth1:
+      ip6: fe80::230:48ff:fe7b:f97b
+    chassis:
+      serial: X0004759
+  chinqchint-32:
+    bmc:
+      ip: 172.17.34.132
+      mac: 00:30:48:96:25:26
+    eth0:
+      ip6: fe80::230:48ff:fe7b:f976
+    eth1:
+      ip6: fe80::230:48ff:fe7b:f977
+    chassis:
+      serial: X0004759
+  chinqchint-34:
+    bmc:
+      ip: 172.17.34.134
+      mac: 00:30:48:94:38:87
+    eth0:
+      ip6: fe80::230:48ff:fe7a:5f16
+    eth1:
+      ip6: fe80::230:48ff:fe7a:5f17
+    chassis:
+      serial: X0004754
+  chinqchint-35:
+    bmc:
+      ip: 172.17.34.135
+      mac: 00:30:48:95:4b:b7
+    eth0:
+      ip6: fe80::230:48ff:fe7c:3df4
+    eth1:
+      ip6: fe80::230:48ff:fe7c:3df5
+    chassis:
+      serial: X0004743
+  chinqchint-37:
+    bmc:
+      ip: 172.17.34.137
+      mac: 00:30:48:94:36:15
+    eth0:
+      ip6: fe80::230:48ff:fe7c:8104
+    eth1:
+      ip6: fe80::230:48ff:fe7c:8105
+    chassis:
+      serial: X0004751
+  chinqchint-38:
+    bmc:
+      ip: 172.17.34.138
+      mac: 00:30:48:94:1c:9a
+    eth0:
+      ip6: fe80::230:48ff:fe7c:7c80
+    eth1:
+      ip6: fe80::230:48ff:fe7c:7c81
+    chassis:
+      serial: X0004751
+  chinqchint-39:
+    bmc:
+      ip: 172.17.34.139
+      mac: 00:30:48:94:2f:6e
+    eth0:
+      ip6: fe80::230:48ff:fe7d:f14
+    eth1:
+      ip6: fe80::230:48ff:fe7d:f15
+    chassis:
+      serial: X0004738
+  chinqchint-4:
+    bmc:
+      ip: 172.17.34.104
+      mac: 00:30:48:94:44:21
+    eth0:
+      ip6: fe80::230:48ff:fe7d:2f1a
+    eth1:
+      ip6: fe80::230:48ff:fe7d:2f1b
+    chassis:
+      serial: X0004742
+  chinqchint-40:
+    bmc:
+      ip: 172.17.34.140
+      mac: 00:30:48:94:4b:4c
+    eth0:
+      ip6: fe80::230:48ff:fe7d:3574
+    eth1:
+      ip6: fe80::230:48ff:fe7d:3575
+    chassis:
+      serial: X0004738
+  chinqchint-41:
+    bmc:
+      ip: 172.17.34.141
+      mac: 00:30:48:96:07:ef
+    eth0:
+      ip6: fe80::230:48ff:fe7a:5bde
+    eth1:
+      ip6: fe80::230:48ff:fe7a:5bdf
+    chassis:
+      serial: X0004756
+  chinqchint-42:
+    bmc:
+      ip: 172.17.34.142
+      mac: 00:30:48:96:07:f1
+    eth0:
+      ip6: fe80::230:48ff:fe7a:5ce4
+    eth1:
+      ip6: fe80::230:48ff:fe7a:5ce5
+    chassis:
+      serial: X0004756
+  chinqchint-43:
+    bmc:
+      ip: 172.17.34.143
+      mac: 00:30:48:96:25:e1
+    eth0:
+      ip6: fe80::230:48ff:fe7c:6ee8
+    eth1:
+      ip6: fe80::230:48ff:fe7c:6ee9
+    chassis:
+      serial: X0004750
+  chinqchint-44:
+    bmc:
+      ip: 172.17.34.144
+      mac: 00:30:48:96:25:d1
+    eth0:
+      ip6: fe80::230:48ff:fe7c:66ec
+    eth1:
+      ip6: fe80::230:48ff:fe7c:66ed
+    chassis:
+      serial: X0004750
+  chinqchint-45:
+    bmc:
+      ip: 172.17.34.145
+      mac: 00:30:48:96:25:65
+    eth0:
+      ip6: fe80::230:48ff:fe7c:70a0
+    eth1:
+      ip6: fe80::230:48ff:fe7c:70a1
+    chassis:
+      serial: X0004749
+  chinqchint-5:
+    bmc:
+      ip: 172.17.34.105
+      mac: 00:30:48:96:25:dd
+    eth0:
+      ip6: fe80::230:48ff:fe7c:6ebe
+    eth1:
+      ip6: fe80::230:48ff:fe7c:6ebf
+    chassis:
+      serial: X0004745
+  chinqchint-6:
+    bmc:
+      ip: 172.17.34.106
+      mac: 00:30:48:96:25:e0
+    eth0:
+      ip6: fe80::230:48ff:fe7c:6ebc
+    eth1:
+      ip6: fe80::230:48ff:fe7c:6ebd
+    chassis:
+      serial: X0004745
+  chinqchint-7:
+    bmc:
+      ip: 172.17.34.107
+      mac: 00:30:48:96:07:fa
+    eth0:
+      ip6: fe80::230:48ff:fe7c:3dd4
+    eth1:
+      ip6: fe80::230:48ff:fe7c:3dd5
+    chassis:
+      serial: X0004744
+  chinqchint-9:
+    bmc:
+      ip: 172.17.34.109
+      mac: 00:30:48:94:1b:e2
+    eth0:
+      ip6: fe80::230:48ff:fe7c:8106
+    eth1:
+      ip6: fe80::230:48ff:fe7c:8107
+    chassis:
+      serial: X0004760
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
index 17b3a77ca28570e691aa0e5b61a9488335ec4e35..40eff57c3314b313ebe589edb2ce03c6b2656ee9 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004740
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b6
-      ip6: fe80::260:ddff:fe47:4bb6
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.101
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:7c:86
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.1
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:7c:87
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.1
-    bmc:
-      mac: 00:30:48:96:07:e5
-      ip: 172.17.34.101
+      mac: 00:30:48:7c:7c:87
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004740
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
index 1fbcb91a5e9242a33004a909558b01add8d60be8..fa3246dc0ba3a0bb91b9c46bbaf7963095ae53cf 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-10:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004760
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:35
-      ip6: fe80::260:ddff:fe47:4d35
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.110
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:81:08
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.10
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:09
-      ip6: fe80::230:48ff:fe7c:8109
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.10
-    bmc:
-      mac: 00:30:48:94:2d:7a
-      ip: 172.17.34.110
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      mac: 00:30:48:7c:81:09
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004760
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
index ba3290aeb3801783469aba343cdb47a2ae20aeeb..9efdd791a48d1d92e8092bea472b8f9766d1d588 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-11:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004758
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:30
-      ip6: fe80::260:ddff:fe47:4d30
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.111
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:67:b0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.11
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:67:b1
-      ip6: fe80::230:48ff:fe7c:67b1
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.11
-    bmc:
-      mac:
-      ip: 172.17.34.111
-  chassis:
-    serial: X0004758
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7c:67:b1
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
index 47c420cf2ff70ae5a428cd93800564611762eace..40568e1b70f4c830693ad6092e216b13d9c23f64 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-12:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004758
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6c
-      ip6: fe80::260:ddff:fe47:4c6c
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.112
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:6e:b8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.12
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:b9
-      ip6: fe80::230:48ff:fe7c:6eb9
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.12
-    bmc:
-      mac:
-      ip: 172.17.34.112
+      mac: 00:30:48:7c:6e:b9
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004758
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
index b96c29b210a53cde551550be2422e5d7cb24148c..1fb5ac31a26f51fbf8fd89d4bbfabbef90fe9944 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-13:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004757
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:8d
-      ip6: fe80::260:ddff:fe47:498d
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.113
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:00:86
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.13
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:00:87
-      ip6: fe80::230:48ff:fe7c:87
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.13
-    bmc:
-      mac: 00:30:48:94:36:4c
-      ip: 172.17.34.113
+      mac: 00:30:48:7c:00:87
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004757
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
index db9f8f30ec21b914b7caf38a3747fd9741941759..31105ce312fd7c61d72dc104be61f2ca10d7b556 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-14:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004757
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:8a
-      ip6: fe80::260:ddff:fe47:498a
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.114
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:00:74
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.14
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:00:75
-      ip6: fe80::230:48ff:fe7c:75
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.14
-    bmc:
-      mac: 00:30:48:94:35:de
-      ip: 172.17.34.114
+      mac: 00:30:48:7c:00:75
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004757
-    manufacturer: SGI.COM
-    name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
index 58172e28b7993d3e7a4bbf7d0f692c7f448ed1ef..0403cd17d039735d0f2981d0aa812df107ca06aa 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-15:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004741
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:9c
-      ip6: fe80::260:ddff:fe47:499c
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.115
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:7f:9e
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.15
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:7f:9f
-      ip6: fe80::230:48ff:fe7c:7f9f
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.15
-    bmc:
-      mac: 00:30:48:96:25:b9
-      ip: 172.17.34.115
-  chassis:
-    serial: X0004741
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7c:7f:9f
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
index bea9a09c47b5626cad86370a04c19fec25965f65..c05ff97bad1f226b850c48768ab266b5fd1cca18 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-16:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004741
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:32
-      ip6: fe80::260:ddff:fe47:4d32
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.116
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:80:fe
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.16
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:80:ff
-      ip6: fe80::230:48ff:fe7c:80ff
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.16
-    bmc:
-      mac: 00:30:48:96:24:e1
-      ip: 172.17.34.116
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      mac: 00:30:48:7c:80:ff
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004741
-    manufacturer: SGI.COM
-    name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
index 31f7d005e8401afb7146ffbd7b5d1fb4da5d5b26..b8308510907935925c9acd6c3eb234c9fae81ca5 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-17:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004746
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:85
-      ip6: fe80::260:ddff:fe47:4985
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.117
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:6f:5c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.17
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6f:5d
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.17
-    bmc:
-      mac: 00:30:48:96:26:5a
-      ip: 172.17.34.117
+      mac: 00:30:48:7c:6f:5d
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004746
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
index 94e34231926b730bdbe666f6690738fa7835f1d4..906c845563c25cc8e7c1f1bba77451ee5e823710 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-18:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004746
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:31
-      ip6: fe80::260:ddff:fe47:4d31
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.118
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:67:de
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.18
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:67:df
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.18
-    bmc:
-      mac: 00:30:48:96:25:76
-      ip: 172.17.34.118
+      mac: 00:30:48:7c:67:df
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004746
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
index 0b817cd710fa5daed194024551b513f687e9fe21..7e7b83023f1474b8fe2c48bdac8a20747da7475f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-19:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004748
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:eb
-      ip6: fe80::260:ddff:fe47:49eb
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.119
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:6f:0c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.19
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6f:0d
-      ip6: fe80::230:48ff:fe7c:6f0d
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.19
-    bmc:
-      mac: 00:30:48:96:25:de
-      ip: 172.17.34.119
-  chassis:
-    serial: X0004748
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7c:6f:0d
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
index 69f9f40fc9999ae2b4aae1840b9b34f56666db4d..bc8b7b471c8fd5815e8ee6f2ca421b6d85a24a99 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-2:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004740
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b8
-      ip6: fe80::260:ddff:fe47:4bb8
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.102
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:7f:22
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.2
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:7f:23
-      ip6: fe80::230:48ff:fe7c:7f23
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.2
-    bmc:
-      mac: 00:30:48:96:25:67
-      ip: 172.17.34.102
-  chassis:
-    serial: X0004740
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7c:7f:23
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
index 21bb08a98a88f16b19787f888021b253d349414e..d82247d13c3bc4d2a0ee67868fe91432339f13a8 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-20:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004748
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:86
-      ip6: fe80::260:ddff:fe47:4986
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.120
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:67:bc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.20
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:67:bd
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.20
-    bmc:
-      mac: 00:30:48:96:25:c7
-      ip: 172.17.34.120
+      mac: 00:30:48:7c:67:bd
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004748
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
index 822843a411749e41f89a2d1a6628db68909aa8a1..898227d9b50960a70103e73f398361b11d07773a 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-21:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 04/09/2008
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X1------
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:ee
-      ip6: fe80::260:ddff:fe47:49ee
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.121
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:70:a6
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.21
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:70:a7
-      ip6: fe80::230:48ff:fe7c:70a7
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.21
-    bmc:
-      mac: 00:30:48:94:4a:34
-      ip: 172.17.34.121
+      mac: 00:30:48:7c:70:a7
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  chassis:
-    serial: X1------
-    manufacturer: SGI.COM
-    name: AltixXE310
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
index 97b66b74d7a358b2b9044b145923573c3c439a15..c06b577a4114bcd6ee674fcc9f55cea1378d7323 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-22:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004739
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e3
-      ip6: fe80::260:ddff:fe47:49e3
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.122
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:3d:da
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.22
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:db
-      ip6: fe80::230:48ff:fe7c:3ddb
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.22
-    bmc:
-      mac: 00:30:48:94:4b:02
-      ip: 172.17.34.122
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      mac: 00:30:48:7c:3d:db
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004739
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
index f6aea59715ddea609c69e2340be128d165d099ec..8125216a3e7d8848426400bf13d309d46d226fb7 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-24:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004752
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:f1
-      ip6: fe80::260:ddff:fe47:49f1
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.124
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:80:e8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.24
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:80:e9
-      ip6: fe80::230:48ff:fe7c:80e9
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.24
-    bmc:
-      mac: 00:30:48:94:2d:76
-      ip: 172.17.34.124
-  chassis:
-    serial: X0004752
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7c:80:e9
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
index 6b85a42451ed32d73877eafc30b3d912a39db8e8..b1cb59123efe57c7d617d3caaf4fb5553c97a9a9 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-25:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004755
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:dd
-      ip6: fe80::260:ddff:fe47:4cdd
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.125
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:81:0a
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.25
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:0b
-      ip6: fe80::230:48ff:fe7c:810b
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.25
-    bmc:
-      mac: 00:30:48:9b:1a:cf
-      ip: 172.17.34.125
+      mac: 00:30:48:7c:81:0b
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004755
-    manufacturer: SGI.COM
-    name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
index ecb186adfb9465fb2231b648e9a82d2a67fdafc6..4f5a9438a03ff818ef6318c925447488a89703f7 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-26:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004755
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:ab
-      ip6: fe80::260:ddff:fe47:4bab
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.126
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:80:ea
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.26
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:80:eb
-      ip6: fe80::230:48ff:fe7c:80eb
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.26
-    bmc:
-      mac: 00:30:48:96:26:54
-      ip: 172.17.34.126
+      mac: 00:30:48:7c:80:eb
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  chassis:
-    serial: X0004755
-    manufacturer: SGI.COM
-    name: AltixXE310
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
index b2a43c5d822e572b922af748eecd1cec0b7bcd94..2bcb03f58ab7b979f5a05cdb881b9068803ec143 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-27:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004747
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:ec
-      ip6: fe80::260:ddff:fe47:49ec
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.127
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:6e:b4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.27
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:b5
-      ip6: fe80::230:48ff:fe7c:6eb5
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.27
-    bmc:
-      mac: 00:30:48:96:25:63
-      ip: 172.17.34.127
+      mac: 00:30:48:7c:6e:b5
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  chassis:
-    serial: X0004747
-    manufacturer: SGI.COM
-    name: AltixXE310
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
index 4fb227ecdef82fed6347fdb07825bb5f4d9df58a..d5f41a73c77c8eb15e763465098962083bfad0a0 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-28:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004747
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e5
-      ip6: fe80::260:ddff:fe47:49e5
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.128
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:6e:da
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.28
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:db
-      ip6: fe80::230:48ff:fe7c:6edb
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.28
-    bmc:
-      mac: 00:30:48:96:26:b2
-      ip: 172.17.34.128
-  chassis:
-    serial: X0004747
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7c:6e:db
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
index d6942bffee7f5d9da18486d7cf95c7c1ba4e042f..0839ac98387bfa7a7010ab43f6130f05e3544a91 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-29:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004753
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:45
-      ip6: fe80::260:ddff:fe47:4d45
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.129
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:81:2a
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.29
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:2b
-      ip6: fe80::230:48ff:fe7c:812b
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.29
-    bmc:
-      mac: 00:30:48:94:37:d3
-      ip: 172.17.34.129
+      mac: 00:30:48:7c:81:2b
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004753
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
index 671cb77833b9993bc27c305ba1b548f54807b941..2199234f0a47854f87f8e9bdee6b80a59d3e506e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004742
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:bb
-      ip6: fe80::260:ddff:fe47:4cbb
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.103
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7b:fd:0e
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.3
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7b:fd:0f
-      ip6: fe80::230:48ff:fe7b:fd0f
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.3
-    bmc:
-      mac: 00:30:48:94:4a:7e
-      ip: 172.17.34.103
-  chassis:
-    serial: X0004742
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7b:fd:0f
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
index 79cbd093d8ef1d1d740f1d2f7f2ea15cf4172a1e..515dc61f06e28af641dda21ddea7f6c398bc913a 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-30:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004753
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b0
-      ip6: fe80::260:ddff:fe47:4bb0
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.130
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:bb:fa
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.30
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:bb:fb
-      ip6: fe80::230:48ff:fe7c:bbfb
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.30
-    bmc:
-      mac:
-      ip: 172.17.34.130
+      mac: 00:30:48:7c:bb:fb
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004753
-    manufacturer: SGI.COM
-    name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
index 3a5ce36c7c68fdbd0085e6e4b157a13d4a55aa79..564a8c131f97c79abcb597346c1a52a1d56ec592 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-31:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004759
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e1
-      ip6: fe80::260:ddff:fe47:49e1
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.131
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7b:f9:7a
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.31
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7b:f9:7b
-      ip6: fe80::230:48ff:fe7b:f97b
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.31
-    bmc:
-      mac:
-      ip: 172.17.34.131
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      mac: 00:30:48:7b:f9:7b
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004759
-    manufacturer: SGI.COM
-    name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
index 4cf4b24ba2ae05f12e1368699c0cbae7c080ec65..6e095166c90e72644747b08a2040163968e6c74e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-32:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004759
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e9
-      ip6: fe80::260:ddff:fe47:49e9
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.132
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7b:f9:76
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.32
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7b:f9:77
-      ip6: fe80::230:48ff:fe7b:f977
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.32
-    bmc:
-      mac:
-      ip: 172.17.34.132
+      mac: 00:30:48:7b:f9:77
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004759
-    manufacturer: SGI.COM
-    name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
index a8ed04ce5d932cc9aab1efa5ef7186ad3f88d2ac..73a92cbdb71f928a731cd1448593d5527c5a9e97 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-34:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004754
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:b8
-      ip6: fe80::260:ddff:fe47:49b8
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.134
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7a:5f:16
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.34
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7a:5f:17
-      ip6: fe80::230:48ff:fe7a:5f17
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.34
-    bmc:
-      mac:
-      ip: 172.17.34.134
+      mac: 00:30:48:7a:5f:17
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004754
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
index d2039200b1a52509d8449daa7df0a1573f887c2c..c9e751af5d863172bdab7bd742235c1f356fad50 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-35:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004743
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e2
-      ip6: fe80::260:ddff:fe47:49e2
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.135
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:3d:f4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.35
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:f5
-      ip6: fe80::230:48ff:fe7c:3df5
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.35
-    bmc:
-      mac:
-      ip: 172.17.34.135
+      mac: 00:30:48:7c:3d:f5
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004743
-    manufacturer: SGI.COM
-    name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
index 7a91a95799b29b9d18ee50d11befdcf674e57d0f..f13eb91beb63537502402e55b9b0357b3af1d559 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-37:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004751
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e4
-      ip6: fe80::260:ddff:fe47:49e4
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.137
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:81:04
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.37
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:05
-      ip6: fe80::230:48ff:fe7c:8105
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.37
-    bmc:
-      mac:
-      ip: 172.17.34.137
+      mac: 00:30:48:7c:81:05
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004751
-    manufacturer: SGI.COM
-    name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
index 68e8326922008b72ae5f256a9d86992424511dee..b33e972d2b008eaf2909125ddb17e4df4e3c5063 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-38:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004751
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b2
-      ip6: fe80::260:ddff:fe47:4bb2
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.138
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:7c:80
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.38
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:7c:81
-      ip6: fe80::230:48ff:fe7c:7c81
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.38
-    bmc:
-      mac: 00:30:48:94:1c:9a
-      ip: 172.17.34.138
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      mac: 00:30:48:7c:7c:81
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004751
-    manufacturer: SGI.COM
-    name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
index f2142265cfe588ce063c27ad354ab37cbdf97371..817afd0412b7d02784933c3c919f78a41ec05e06 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-39:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004738
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b1
-      ip6: fe80::260:ddff:fe47:4bb1
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.139
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7d:0f:14
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.39
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7d:0f:15
-      ip6: fe80::230:48ff:fe7d:f15
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.39
-    bmc:
-      mac: 00:30:48:94:2f:6e
-      ip: 172.17.34.139
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      mac: 00:30:48:7d:0f:15
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  chassis:
-    serial: X0004738
-    manufacturer: SGI.COM
-    name: AltixXE310
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
index 3839baf8f4c98414e802e22577db93372d852433..222581b99f927cb06886dd0de70ecad8b3ea9770 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-4:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004742
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:b8
-      ip6: fe80::260:ddff:fe47:4cb8
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.104
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7d:2f:1a
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.4
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7d:2f:1b
-      ip6: fe80::230:48ff:fe7d:2f1b
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.4
-    bmc:
-      mac: 00:30:48:94:44:21
-      ip: 172.17.34.104
+      mac: 00:30:48:7d:2f:1b
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  chassis:
-    serial: X0004742
-    manufacturer: SGI.COM
-    name: AltixXE310
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
index 4ed0f9ce345cac2827cb578b6c9bc18c143b9953..eab7eca27a1e59592a3987809d35996e7b1e6fee 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-40:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004738
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:af
-      ip6: fe80::260:ddff:fe47:4baf
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.140
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7d:35:74
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.40
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7d:35:75
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.40
-    bmc:
-      mac: 00:30:48:94:4b:4c
-      ip: 172.17.34.140
+      mac: 00:30:48:7d:35:75
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004738
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
index 884ed600bafabff68b52ecc9f0f8d2341082a249..85a334bc09787a96aa8f4d495cbf0597e8af0eca 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-41:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004756
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:48
-      ip6: fe80::260:ddff:fe47:4d48
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.141
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7a:5b:de
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.41
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7a:5b:df
-      ip6: fe80::230:48ff:fe7a:5bdf
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.41
-    bmc:
-      mac: 00:30:48:96:07:ef
-      ip: 172.17.34.141
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  chassis:
-    serial: X0004756
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7a:5b:df
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
index cae7f4812059bc290db4b8a34c27bddc2bb88c74..b4b92b58638c69715dc766ce33f2e82b92e1b175 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-42:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004756
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:c0
-      ip6: fe80::260:ddff:fe47:4cc0
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.142
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7a:5c:e4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.42
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7a:5c:e5
-      ip6: fe80::230:48ff:fe7a:5ce5
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.42
-    bmc:
-      mac: 00:30:48:96:07:f1
-      ip: 172.17.34.142
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  chassis:
-    serial: X0004756
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7a:5c:e5
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
index a0ad93394996036924e577e6fdbadef654bfc138..0bb0dac9f5895ac979ac2adb46e3fd8f78578de9 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-43:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004750
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:ba
-      ip6: fe80::260:ddff:fe47:4bba
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.143
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:6e:e8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.43
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:e9
-      ip6: fe80::230:48ff:fe7c:6ee9
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.43
-    bmc:
-      mac: 00:30:48:96:25:e1
-      ip: 172.17.34.143
-  chassis:
-    serial: X0004750
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7c:6e:e9
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
index 41422fe6d34acd8ad4453a86ec0be67157cd7145..013fb1374b5aca98c3518a39ab6a9b9b954aca10 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-44:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004750
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b6
-      ip6: fe80::260:ddff:fe47:4bb6
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.144
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:66:ec
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.44
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:66:ed
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.44
-    bmc:
-      mac: 00:30:48:96:25:d1
-      ip: 172.17.34.144
+      mac: 00:30:48:7c:66:ed
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004750
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
index d160b2c8ff95a7a4dd40e30bbae890b40503a9ee..bdb333409cfd84468d80d568fedfda6464b00c05 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-45:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004749
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b4
-      ip6: fe80::260:ddff:fe47:4bb4
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.145
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:70:a0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.45
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:70:a1
-      ip6: fe80::230:48ff:fe7c:70a1
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.45
-    bmc:
-      mac: 00:30:48:96:25:65
-      ip: 172.17.34.145
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      mac: 00:30:48:7c:70:a1
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  chassis:
-    serial: X0004749
-    manufacturer: SGI.COM
-    name: AltixXE310
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
index e8d92804ab3951ad96ff0e4704b3faabe53f3619..bb8fef369c4a1b34374df762007739e9043eafd0 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004745
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e7
-      ip6: fe80::260:ddff:fe47:49e7
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.105
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:6e:be
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.5
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:bf
-      ip6: fe80::230:48ff:fe7c:6ebf
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.5
-    bmc:
-      mac: 00:30:48:96:25:dd
-      ip: 172.17.34.105
+      mac: 00:30:48:7c:6e:bf
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004745
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
index 5de755248f9ac0760523a08114b548735c102f7d..e123288a3c60be678130780daae2da727ed650b9 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-6:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: Hitachi HDT72502
-      size: 250059350016
-      rev: A7EA
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004745
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:cb
-      ip6: fe80::260:ddff:fe47:49cb
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.106
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:6e:bc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.6
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:bd
-      ip6: fe80::230:48ff:fe7c:6ebd
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.6
-    bmc:
-      mac: 00:30:48:96:25:e0
-      ip: 172.17.34.106
-  chassis:
-    serial: X0004745
-    manufacturer: SGI.COM
-    name: AltixXE310
+      mac: 00:30:48:7c:6e:bd
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      model: Hitachi HDT72502
+      rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
index 17370dff7402e7ff72a8ff7b6c247be6fd540e59..b0f713232e888441f28da5443aa88352d8e0771a 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-7:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004744
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:d5
-      ip6: fe80::260:ddff:fe47:4cd5
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.107
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:3d:d4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.7
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:d5
-      ip6: fe80::230:48ff:fe7c:3dd5
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.7
-    bmc:
-      mac: 00:30:48:96:07:fa
-      ip: 172.17.34.107
+      mac: 00:30:48:7c:3d:d5
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  chassis:
-    serial: X0004744
-    manufacturer: SGI.COM
-    name: AltixXE310
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
index ac346f835c85128929302a4bef6a6b4116d0b55c..254180a6f11eabf0d0aeb532096a3a9938cb6c2e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
@@ -1,74 +1,39 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-9:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004760
+  main_memory:
+    ram_size: 8391753728
   network_adapters:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6f
-      ip6: fe80::260:ddff:fe47:4c6f
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.109
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:81:06
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.9
+      mounted: false
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:07
-      ip6: fe80::230:48ff:fe7c:8107
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.34.9
-    bmc:
-      mac: 00:30:48:94:1b:e2
-      ip: 172.17.34.109
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+      mac: 00:30:48:7c:81:07
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
-  chassis:
-    serial: X0004760
-    manufacturer: SGI.COM
-    name: AltixXE310
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8