diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
deleted file mode 100644
index 56d2fa48846a0b6cec8acf8251b4493033bc0dce..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
+++ /dev/null
@@ -1,206 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.1",
-      "kavlan-11": "10.7.200.93",
-      "kavlan-12": "10.11.200.93",
-      "kavlan-13": "10.15.200.93",
-      "kavlan-14": "10.19.200.93",
-      "kavlan-16": "10.27.200.93",
-      "kavlan-18": "10.35.200.93",
-      "kavlan-19": "10.39.200.93",
-      "kavlan-2": "192.168.210.1",
-      "kavlan-20": "10.43.200.93",
-      "kavlan-21": "10.47.200.93",
-      "kavlan-3": "192.168.226.1",
-      "kavlan-4": "10.16.2.1",
-      "kavlan-5": "10.16.66.1",
-      "kavlan-6": "10.16.130.1",
-      "kavlan-7": "10.16.194.1",
-      "kavlan-8": "10.17.2.1",
-      "kavlan-9": "10.17.66.1"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.1",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:80",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-1.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/2"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:81",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:82",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:81",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.1",
-      "ip6": "fe80::202:c903:b:9281",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-1-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:82",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.1",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:83",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-1-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/25"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
deleted file mode 100644
index c5ffd981b89f81e42ede9b33c4958e5ce67a08d8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501",
-    "serial": 1009390125
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.123",
-      "kavlan-11": "10.7.200.215",
-      "kavlan-12": "10.11.200.215",
-      "kavlan-13": "10.15.200.215",
-      "kavlan-14": "10.19.200.215",
-      "kavlan-16": "10.27.200.215",
-      "kavlan-18": "10.35.200.215",
-      "kavlan-19": "10.39.200.215",
-      "kavlan-2": "192.168.210.123",
-      "kavlan-20": "10.43.200.215",
-      "kavlan-21": "10.47.200.215",
-      "kavlan-3": "192.168.226.123",
-      "kavlan-4": "10.16.2.123",
-      "kavlan-5": "10.16.66.123",
-      "kavlan-6": "10.16.130.123",
-      "kavlan-7": "10.16.194.123",
-      "kavlan-8": "10.17.2.123",
-      "kavlan-9": "10.17.66.123"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.123",
-      "ip6": "fe80::2e0:81ff:fed5:6ac",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:ac",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-123.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/19"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:ad",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:ae",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:19",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.123",
-      "ip6": "fe80::202:c903:b:9219",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-123-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.123",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:af",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-123-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/43"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 23,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "A3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-123"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
deleted file mode 100644
index 83a928837c0ed911779c5c8f4bc314dc28144733..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501",
-    "serial": 1009390146
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.144",
-      "kavlan-11": "10.7.200.236",
-      "kavlan-12": "10.11.200.236",
-      "kavlan-13": "10.15.200.236",
-      "kavlan-14": "10.19.200.236",
-      "kavlan-16": "10.27.200.236",
-      "kavlan-18": "10.35.200.236",
-      "kavlan-19": "10.39.200.236",
-      "kavlan-2": "192.168.210.144",
-      "kavlan-20": "10.43.200.236",
-      "kavlan-21": "10.47.200.236",
-      "kavlan-3": "192.168.226.144",
-      "kavlan-4": "10.16.2.144",
-      "kavlan-5": "10.16.66.144",
-      "kavlan-6": "10.16.130.144",
-      "kavlan-7": "10.16.194.144",
-      "kavlan-8": "10.17.2.144",
-      "kavlan-9": "10.17.66.144"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.144",
-      "ip6": "fe80::2e0:81ff:fed5:6b8",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:b8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-144.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/40"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:b9",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:ba",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5b",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.144",
-      "ip6": "fe80::202:c903:5:f85b",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-144-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5c",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.144",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:bb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-144-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/20"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 24,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "A3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-144"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
deleted file mode 100644
index 4414b5bc34876b02504801965adc2ee57559c1fa..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501",
-    "serial": 1009390030
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.28",
-      "kavlan-11": "10.7.200.120",
-      "kavlan-12": "10.11.200.120",
-      "kavlan-13": "10.15.200.120",
-      "kavlan-14": "10.19.200.120",
-      "kavlan-16": "10.27.200.120",
-      "kavlan-18": "10.35.200.120",
-      "kavlan-19": "10.39.200.120",
-      "kavlan-2": "192.168.210.28",
-      "kavlan-20": "10.43.200.120",
-      "kavlan-21": "10.47.200.120",
-      "kavlan-3": "192.168.226.28",
-      "kavlan-4": "10.16.2.28",
-      "kavlan-5": "10.16.66.28",
-      "kavlan-6": "10.16.130.28",
-      "kavlan-7": "10.16.194.28",
-      "kavlan-8": "10.17.2.28",
-      "kavlan-9": "10.17.66.28"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.28",
-      "ip6": "fe80::2e0:81ff:fed5:65c",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:f0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-28.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/27"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:f1",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:f2",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.28",
-      "ip6": "fe80::202:c903:b:928d",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-28-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.28",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:f3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-28-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/8"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "A3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-28"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
deleted file mode 100644
index 0f99b168574b115f2f2a939ce899e38748825a96..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501",
-    "serial": 605634005
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.3",
-      "kavlan-11": "10.7.200.95",
-      "kavlan-12": "10.11.200.95",
-      "kavlan-13": "10.15.200.95",
-      "kavlan-14": "10.19.200.95",
-      "kavlan-16": "10.27.200.95",
-      "kavlan-18": "10.35.200.95",
-      "kavlan-19": "10.39.200.95",
-      "kavlan-2": "192.168.210.3",
-      "kavlan-20": "10.43.200.95",
-      "kavlan-21": "10.47.200.95",
-      "kavlan-3": "192.168.226.3",
-      "kavlan-4": "10.16.2.3",
-      "kavlan-5": "10.16.66.3",
-      "kavlan-6": "10.16.130.3",
-      "kavlan-7": "10.16.194.3",
-      "kavlan-8": "10.17.2.3",
-      "kavlan-9": "10.17.66.3"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.3",
-      "ip6": "fe80::2e0:81ff:fed5:870",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:70",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-3.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/4"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:71",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:72",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:59",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.3",
-      "ip6": "fe80::202:c903:b:9159",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-3-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.3",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:73",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-3-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/27"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "A3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
deleted file mode 100644
index db7e6c32d88d6b8e21187915ea741f660d89a23d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.36",
-      "kavlan-11": "10.7.200.128",
-      "kavlan-12": "10.11.200.128",
-      "kavlan-13": "10.15.200.128",
-      "kavlan-14": "10.19.200.128",
-      "kavlan-16": "10.27.200.128",
-      "kavlan-18": "10.35.200.128",
-      "kavlan-19": "10.39.200.128",
-      "kavlan-2": "192.168.210.36",
-      "kavlan-20": "10.43.200.128",
-      "kavlan-21": "10.47.200.128",
-      "kavlan-3": "192.168.226.36",
-      "kavlan-4": "10.16.2.36",
-      "kavlan-5": "10.16.66.36",
-      "kavlan-6": "10.16.130.36",
-      "kavlan-7": "10.16.194.36",
-      "kavlan-8": "10.17.2.36",
-      "kavlan-9": "10.17.66.36"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.36",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:48",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-36.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/35"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:49",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:4a",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.36",
-      "ip6": "fe80::202:c903:b:92b9",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-36-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ba",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.36",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:4b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-36-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/16"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "A3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-36"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
deleted file mode 100644
index 110545ee5205b3163bead7d09145b8db6c0910e6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.40",
-      "kavlan-11": "10.7.200.132",
-      "kavlan-12": "10.11.200.132",
-      "kavlan-13": "10.15.200.132",
-      "kavlan-14": "10.19.200.132",
-      "kavlan-16": "10.27.200.132",
-      "kavlan-18": "10.35.200.132",
-      "kavlan-19": "10.39.200.132",
-      "kavlan-2": "192.168.210.40",
-      "kavlan-20": "10.43.200.132",
-      "kavlan-21": "10.47.200.132",
-      "kavlan-3": "192.168.226.40",
-      "kavlan-4": "10.16.2.40",
-      "kavlan-5": "10.16.66.40",
-      "kavlan-6": "10.16.130.40",
-      "kavlan-7": "10.16.194.40",
-      "kavlan-8": "10.17.2.40",
-      "kavlan-9": "10.17.66.40"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.40",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:f4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-40.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/1"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:f5",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:f6",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.40",
-      "ip6": "fe80::202:c903:b:93cd",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-40-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-40-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/25"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "A3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-40"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
deleted file mode 100644
index f52ff824eef1ac6f1f5597bcc3f34e8dd7e4a621..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501",
-    "serial": null
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.56",
-      "kavlan-11": "10.7.200.148",
-      "kavlan-12": "10.11.200.148",
-      "kavlan-13": "10.15.200.148",
-      "kavlan-14": "10.19.200.148",
-      "kavlan-16": "10.27.200.148",
-      "kavlan-18": "10.35.200.148",
-      "kavlan-19": "10.39.200.148",
-      "kavlan-2": "192.168.210.56",
-      "kavlan-20": "10.43.200.148",
-      "kavlan-21": "10.47.200.148",
-      "kavlan-3": "192.168.226.56",
-      "kavlan-4": "10.16.2.56",
-      "kavlan-5": "10.16.66.56",
-      "kavlan-6": "10.16.130.56",
-      "kavlan-7": "10.16.194.56",
-      "kavlan-8": "10.17.2.56",
-      "kavlan-9": "10.17.66.56"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.56",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:78",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-56.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/17"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:79",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:7a",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:89",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.56",
-      "ip6": "fe80::202:c903:b:9189",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-56-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.56",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:7b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-56-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/1"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "A3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-56"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
deleted file mode 100644
index bdb6028090af402b6ffb5a475342c67ef9451ba3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
+++ /dev/null
@@ -1,206 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.83",
-      "kavlan-11": "10.7.200.175",
-      "kavlan-12": "10.11.200.175",
-      "kavlan-13": "10.15.200.175",
-      "kavlan-14": "10.19.200.175",
-      "kavlan-16": "10.27.200.175",
-      "kavlan-18": "10.35.200.175",
-      "kavlan-19": "10.39.200.175",
-      "kavlan-2": "192.168.210.83",
-      "kavlan-20": "10.43.200.175",
-      "kavlan-21": "10.47.200.175",
-      "kavlan-3": "192.168.226.83",
-      "kavlan-4": "10.16.2.83",
-      "kavlan-5": "10.16.66.83",
-      "kavlan-6": "10.16.130.83",
-      "kavlan-7": "10.16.194.83",
-      "kavlan-8": "10.17.2.83",
-      "kavlan-9": "10.17.66.83"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.83",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:90",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-83.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/10"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:91",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:92",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.83",
-      "ip6": "fe80::202:c903:b:93a5",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-83-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.83",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:93",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-83-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/33"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "JPFOA3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-83"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
deleted file mode 100644
index 8aaf59a2649d57d59dd948534366ba3e8aef69bf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501",
-    "serial": 1009390096
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.94",
-      "kavlan-11": "10.7.200.186",
-      "kavlan-12": "10.11.200.186",
-      "kavlan-13": "10.15.200.186",
-      "kavlan-14": "10.19.200.186",
-      "kavlan-16": "10.27.200.186",
-      "kavlan-18": "10.35.200.186",
-      "kavlan-19": "10.39.200.186",
-      "kavlan-2": "192.168.210.94",
-      "kavlan-20": "10.43.200.186",
-      "kavlan-21": "10.47.200.186",
-      "kavlan-3": "192.168.226.94",
-      "kavlan-4": "10.16.2.94",
-      "kavlan-5": "10.16.66.94",
-      "kavlan-6": "10.16.130.94",
-      "kavlan-7": "10.16.194.94",
-      "kavlan-8": "10.17.2.94",
-      "kavlan-9": "10.17.66.94"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.94",
-      "ip6": "fe80::2e0:81ff:fed5:790",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:90",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-94.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/19"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:91",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:92",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:95",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.94",
-      "ip6": "fe80::202:c903:b:5c95",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-94-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:96",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.94",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:93",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-94-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/10"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "A3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-94"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
deleted file mode 100644
index 03346e106c1b0fe452750c781837f429bf3dab55..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501",
-    "serial": 1009390100
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.98",
-      "kavlan-11": "10.7.200.190",
-      "kavlan-12": "10.11.200.190",
-      "kavlan-13": "10.15.200.190",
-      "kavlan-14": "10.19.200.190",
-      "kavlan-16": "10.27.200.190",
-      "kavlan-18": "10.35.200.190",
-      "kavlan-19": "10.39.200.190",
-      "kavlan-2": "192.168.210.98",
-      "kavlan-20": "10.43.200.190",
-      "kavlan-21": "10.47.200.190",
-      "kavlan-3": "192.168.226.98",
-      "kavlan-4": "10.16.2.98",
-      "kavlan-5": "10.16.66.98",
-      "kavlan-6": "10.16.130.98",
-      "kavlan-7": "10.16.194.98",
-      "kavlan-8": "10.17.2.98",
-      "kavlan-9": "10.17.66.98"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.64.98",
-      "ip6": "fe80::2e0:81ff:fed5:7d4",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:d4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-98.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/23"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:d5",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 100000000
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:d6",
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:99",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.98",
-      "ip6": "fe80::202:c903:b:5e99",
-      "kavlan": false,
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "graphene-98-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.64.98",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:d7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-98-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/14"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "cstate_max_id": 2,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "rev": "A3EA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-98"
-}
\ No newline at end of file
diff --git a/grid5000-all.json b/grid5000-all.json
index 4de3f1a5fbff2eb29adc5fe1307ef5bf2c86426c..1accbdce0c2285d7950d6ac3cfe6702a0f0c7e4e 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -68258,98 +68258,84 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.1",
+                  "mac": "00:e0:81:d5:06:83",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene1-ipmi",
+                  "switch_port": "1/0/25"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.1",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:06:80",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-1.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene1",
-                  "switch_port": "GigabitEthernet1/0/2"
+                  "switch_port": "Gi1/0/2"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:81",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:82",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:81",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.1",
                   "ip6": "fe80::202:c903:b:9281",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-1-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:82",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.1",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:06:83",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-1-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene1-ipmi",
-                  "switch_port": "1/0/25"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -68359,12 +68345,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 2,
+                  "uid": "graphene-pdu1"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -68380,23 +68371,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "graphene-pdu1"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -68405,7 +68386,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -68415,9 +68396,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-1"
+              }
             },
             "graphene-10": {
               "architecture": {
@@ -74203,99 +74182,85 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
-                "wattmeter": "true"
+                "metric": "power",
+                "wattmeter": true
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.123",
+                  "mac": "00:e0:81:d5:06:af",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene4-ipmi",
+                  "switch_port": "1/0/43"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.123",
                   "ip6": "fe80::2e0:81ff:fed5:6ac",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:06:ac",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-123.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene4",
-                  "switch_port": "GigabitEthernet1/0/19"
+                  "switch_port": "Gi1/0/19"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:ad",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:ae",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:19",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.123",
                   "ip6": "fe80::202:c903:b:9219",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-123-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1a",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.123",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:06:af",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-123-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene4-ipmi",
-                  "switch_port": "1/0/43"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -74305,12 +74270,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 23,
+                  "uid": "graphene-pdu7"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -74326,24 +74296,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "port": 23,
-                        "uid": "graphene-pdu7"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -74352,7 +74311,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -74362,9 +74321,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-123"
+              }
             },
             "graphene-124": {
               "architecture": {
@@ -79272,99 +79229,85 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
-                "wattmeter": "true"
+                "metric": "power",
+                "wattmeter": true
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.144",
+                  "mac": "00:e0:81:d5:06:bb",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene4-ipmi",
+                  "switch_port": "1/0/20"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.144",
                   "ip6": "fe80::2e0:81ff:fed5:6b8",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:06:b8",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-144.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene4",
-                  "switch_port": "GigabitEthernet1/0/40"
+                  "switch_port": "Gi1/0/40"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:b9",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:ba",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5b",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.144",
                   "ip6": "fe80::202:c903:5:f85b",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-144-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5c",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.144",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:06:bb",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-144-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene4-ipmi",
-                  "switch_port": "1/0/20"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -79374,12 +79317,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 24,
+                  "uid": "graphene-pdu8"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -79395,24 +79343,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "port": 24,
-                        "uid": "graphene-pdu8"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -79421,7 +79358,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -79431,9 +79368,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-144"
+              }
             },
             "graphene-15": {
               "architecture": {
@@ -82561,99 +82496,85 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.28",
+                  "mac": "00:e0:81:d5:07:f3",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene1-ipmi",
+                  "switch_port": "1/0/8"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.28",
                   "ip6": "fe80::2e0:81ff:fed5:65c",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:07:f0",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-28.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene1",
-                  "switch_port": "GigabitEthernet1/0/27"
+                  "switch_port": "Gi1/0/27"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:07:f1",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:07:f2",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8d",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.28",
                   "ip6": "fe80::202:c903:b:928d",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-28-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8e",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.28",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:07:f3",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-28-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene1-ipmi",
-                  "switch_port": "1/0/8"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -82663,12 +82584,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 19,
+                  "uid": "graphene-pdu1"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -82684,23 +82610,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "graphene-pdu1"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -82709,7 +82625,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -82719,9 +82635,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-28"
+              }
             },
             "graphene-29": {
               "architecture": {
@@ -82989,99 +82903,85 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.3",
+                  "mac": "00:e0:81:d5:08:73",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene1-ipmi",
+                  "switch_port": "1/0/27"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.3",
                   "ip6": "fe80::2e0:81ff:fed5:870",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:08:70",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-3.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene1",
-                  "switch_port": "GigabitEthernet1/0/4"
+                  "switch_port": "Gi1/0/4"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:08:71",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:08:72",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:59",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.3",
                   "ip6": "fe80::202:c903:b:9159",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-3-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5a",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.3",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:08:73",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-3-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene1-ipmi",
-                  "switch_port": "1/0/27"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -83091,12 +82991,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 4,
+                  "uid": "graphene-pdu1"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -83112,23 +83017,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "graphene-pdu1"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -83137,7 +83032,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -83147,9 +83042,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-3"
+              }
             },
             "graphene-30": {
               "architecture": {
@@ -84517,98 +84410,84 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.36",
+                  "mac": "00:e0:81:d5:06:4b",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene1-ipmi",
+                  "switch_port": "1/0/16"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.36",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:06:48",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-36.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene1",
-                  "switch_port": "GigabitEthernet1/0/35"
+                  "switch_port": "Gi1/0/35"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:49",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:4a",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b9",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.36",
                   "ip6": "fe80::202:c903:b:92b9",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-36-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ba",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.36",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:06:4b",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-36-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene1-ipmi",
-                  "switch_port": "1/0/16"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -84618,12 +84497,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 20,
+                  "uid": "graphene-pdu2"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -84639,23 +84523,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "graphene-pdu2"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -84664,7 +84538,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -84674,9 +84548,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-36"
+              }
             },
             "graphene-37": {
               "architecture": {
@@ -85603,96 +85475,82 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene2-ipmi",
+                  "switch_port": "1/0/25"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.40",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:06:f4",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-40.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene2",
-                  "switch_port": "GigabitEthernet1/0/1"
+                  "switch_port": "Gi1/0/1"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:f5",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:f6",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.40",
                   "ip6": "fe80::202:c903:b:93cd",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-40-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "kavlan": false,
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-40-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene2-ipmi",
-                  "switch_port": "1/0/25"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -85702,12 +85560,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 3,
+                  "uid": "graphene-pdu3"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -85723,23 +85586,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "graphene-pdu3"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -85748,7 +85601,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -85758,9 +85611,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-40"
+              }
             },
             "graphene-41": {
               "architecture": {
@@ -89327,98 +89178,84 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.56",
+                  "mac": "00:e0:81:d5:06:7b",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene2-ipmi",
+                  "switch_port": "1/0/1"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.56",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:06:78",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-56.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene2",
-                  "switch_port": "GigabitEthernet1/0/17"
+                  "switch_port": "Gi1/0/17"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:79",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:7a",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:89",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.56",
                   "ip6": "fe80::202:c903:b:9189",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-56-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8a",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.56",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:06:7b",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-56-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene2-ipmi",
-                  "switch_port": "1/0/1"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -89428,44 +89265,39 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 11,
+                  "uid": "graphene-pdu4"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
                 "cache_l3": 8388608,
                 "clock_speed": 2550000000,
                 "ht_capable": true,
-                "instruction_set": "x86-64",
-                "microarchitecture": "Lynnfield",
-                "model": "Intel Xeon",
-                "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-                "vendor": "Intel",
-                "version": "X3440"
-              },
-              "sensors": {
-                "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "graphene-pdu4"
-                      }
-                    ]
-                  }
+                "instruction_set": "x86-64",
+                "microarchitecture": "Lynnfield",
+                "model": "Intel Xeon",
+                "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
+                "vendor": "Intel",
+                "version": "X3440"
+              },
+              "sensors": {
+                "power": {
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -89474,7 +89306,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -89484,9 +89316,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-56"
+              }
             },
             "graphene-57": {
               "architecture": {
@@ -95913,98 +95743,84 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.83",
+                  "mac": "00:e0:81:d5:06:93",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene3-ipmi",
+                  "switch_port": "1/0/33"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.83",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:06:90",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-83.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene3",
-                  "switch_port": "GigabitEthernet1/0/10"
+                  "switch_port": "Gi1/0/10"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:91",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:06:92",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a5",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.83",
                   "ip6": "fe80::202:c903:b:93a5",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-83-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a6",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.83",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:06:93",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-83-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene3-ipmi",
-                  "switch_port": "1/0/33"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -96014,12 +95830,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 15,
+                  "uid": "graphene-pdu5"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -96035,23 +95856,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "graphene-pdu5"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -96060,7 +95871,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -96070,9 +95881,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-83"
+              }
             },
             "graphene-84": {
               "architecture": {
@@ -98505,99 +98314,85 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.94",
+                  "mac": "00:e0:81:d5:07:93",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene3-ipmi",
+                  "switch_port": "1/0/10"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.94",
                   "ip6": "fe80::2e0:81ff:fed5:790",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:07:90",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-94.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene3",
-                  "switch_port": "GigabitEthernet1/0/19"
+                  "switch_port": "Gi1/0/19"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:07:91",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:07:92",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:95",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.94",
                   "ip6": "fe80::202:c903:b:5c95",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-94-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:96",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.94",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:07:93",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-94-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene3-ipmi",
-                  "switch_port": "1/0/10"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -98607,12 +98402,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 20,
+                  "uid": "graphene-pdu5"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -98628,23 +98428,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "graphene-pdu5"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -98653,7 +98443,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -98663,9 +98453,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-94"
+              }
             },
             "graphene-95": {
               "architecture": {
@@ -99340,99 +99128,85 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.64.98",
+                  "mac": "00:e0:81:d5:07:d7",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "switch": "sgraphene3-ipmi",
+                  "switch_port": "1/0/14"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.64.98",
                   "ip6": "fe80::2e0:81ff:fed5:7d4",
-                  "kavlan": true,
                   "mac": "00:e0:81:d5:07:d4",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-98.nancy.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "sgraphene3",
-                  "switch_port": "GigabitEthernet1/0/23"
+                  "switch_port": "Gi1/0/23"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:07:d5",
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 100000000
                 },
-                {
+                "eth2": {
                   "bridged": false,
-                  "device": "eth2",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:d5:07:d6",
                   "management": false,
                   "mountable": false,
                   "mounted": false
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": true,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:99",
                   "interface": "InfiniBand",
                   "ip": "172.18.64.98",
                   "ip6": "fe80::202:c903:b:5e99",
-                  "kavlan": false,
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "graphene-98-ib0.nancy.grid5000.fr",
                   "rate": 20000000000,
                   "switch": "sgrapheneib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
-                {
-                  "device": "ib1",
+                "ib1": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9a",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.64.98",
-                  "kavlan": false,
-                  "mac": "00:e0:81:d5:07:d7",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "graphene-98-bmc.nancy.grid5000.fr",
-                  "switch": "sgraphene3-ipmi",
-                  "switch_port": "1/0/14"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "intel_idle",
                 "cstate_governor": "menu",
@@ -99442,12 +99216,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": true
               },
+              "pdu": [
+                {
+                  "port": 17,
+                  "uid": "graphene-pdu6"
+                }
+              ],
               "performance": {
                 "core_flops": 8024000000.0,
                 "node_flops": 31010000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 262144,
@@ -99463,23 +99242,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "graphene-pdu6"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "node-was-not-available-to-retrieve-this-value",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDS72103",
@@ -99488,7 +99257,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -99498,9 +99267,7 @@
                   "admin"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "graphene-98"
+              }
             },
             "graphene-99": {
               "architecture": {
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml b/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
index 45adca57cd440f1587a71372ad13ebbd82b20a93..26d3e2c204a94391bb4f849a96c31b4706d31fef 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
@@ -91,8 +91,3 @@ nodes:
     sensors:
       power:
         available: true
-
-  graphene-96:
-    status: retired
-  graphene-86:
-    status: retired
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene_retired.yaml.erb b/input/grid5000/sites/nancy/clusters/graphene/graphene_retired.yaml.erb
new file mode 100644
index 0000000000000000000000000000000000000000..d0f539864db95860cfe10d6b443d9e536d791cd1
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/graphene/graphene_retired.yaml.erb
@@ -0,0 +1,5 @@
+nodes:
+<% [123, 144, 1, 28, 36, 3, 40, 56, 83, 86, 94, 96, 98].each { |i| %>
+  graphene-<%= i %>:
+    status: retired
+<% } %>