diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
deleted file mode 100644
index fe07f50ed5fa3919ae44a5fe5eeac4c54181f471..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/21/2009",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "V1.05"
-  },
-  "chassis": {
-    "manufacturer": "TYAN Computer Corporation",
-    "name": "S5393"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.1",
-      "kavlan-11": "10.7.200.1",
-      "kavlan-12": "10.11.200.1",
-      "kavlan-13": "10.15.200.1",
-      "kavlan-14": "10.19.200.1",
-      "kavlan-16": "10.27.200.1",
-      "kavlan-18": "10.35.200.1",
-      "kavlan-19": "10.39.200.1",
-      "kavlan-2": "192.168.209.1",
-      "kavlan-20": "10.43.200.1",
-      "kavlan-21": "10.47.200.1",
-      "kavlan-3": "192.168.225.1",
-      "kavlan-4": "10.16.1.1",
-      "kavlan-5": "10.16.65.1",
-      "kavlan-6": "10.16.129.1",
-      "kavlan-7": "10.16.193.1",
-      "kavlan-8": "10.17.1.1",
-      "kavlan-9": "10.17.65.1"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.65.1",
-      "kavlan": true,
-      "mac": "00:e0:81:b2:c1:88",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "griffon-1.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgriffon1",
-      "switch_port": "GigabitEthernet1/0/1",
-      "vendor": "intel",
-      "version": "80003ES2LAN"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:b2:c1:89",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "switch": null,
-      "switch_port": null,
-      "vendor": "intel",
-      "version": "BCM5721"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f1",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "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:03:18:f2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.65.1",
-      "kavlan": false,
-      "mac": "00:e0:81:4f:e3:13",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "griffon-1-bmc.nancy.grid5000.fr",
-      "vendor": "Tyan",
-      "version": "M3296"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "cstate_max_id": null,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7963000000.0,
-    "node_flops": 52500000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "L5420"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "griffon-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca34de7b185",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3OA5CA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "griffon-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
deleted file mode 100644
index 798d47bb0871748e6746729843c0e49517ce00a9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/21/2009",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "V1.05"
-  },
-  "chassis": {
-    "manufacturer": "TYAN Computer Corporation",
-    "name": "S5393"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.10",
-      "kavlan-11": "10.7.200.10",
-      "kavlan-12": "10.11.200.10",
-      "kavlan-13": "10.15.200.10",
-      "kavlan-14": "10.19.200.10",
-      "kavlan-16": "10.27.200.10",
-      "kavlan-18": "10.35.200.10",
-      "kavlan-19": "10.39.200.10",
-      "kavlan-2": "192.168.209.10",
-      "kavlan-20": "10.43.200.10",
-      "kavlan-21": "10.47.200.10",
-      "kavlan-3": "192.168.225.10",
-      "kavlan-4": "10.16.1.10",
-      "kavlan-5": "10.16.65.10",
-      "kavlan-6": "10.16.129.10",
-      "kavlan-7": "10.16.193.10",
-      "kavlan-8": "10.17.1.10",
-      "kavlan-9": "10.17.65.10"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.65.10",
-      "kavlan": true,
-      "mac": "00:e0:81:b2:c0:a4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "griffon-10.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgriffon1",
-      "switch_port": "GigabitEthernet1/0/9",
-      "vendor": "intel",
-      "version": "80003ES2LAN"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:b2:c0:a5",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "switch": null,
-      "switch_port": null,
-      "vendor": "intel",
-      "version": "BCM5721"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:59",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "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:02:7f:5a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.65.10",
-      "kavlan": false,
-      "mac": "00:e0:81:4f:ca:9e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "griffon-10-bmc.nancy.grid5000.fr",
-      "vendor": "Tyan",
-      "version": "M3296"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "cstate_max_id": null,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7963000000.0,
-    "node_flops": 52500000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "L5420"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "griffon-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca34de89582",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3OA5CA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "griffon-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
deleted file mode 100644
index 876ad2234c23a2d0ce1d12d7965d7dd4084870b7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/21/2009",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "V1.05"
-  },
-  "chassis": {
-    "manufacturer": "TYAN Computer Corporation",
-    "name": "S5393"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.2",
-      "kavlan-11": "10.7.200.2",
-      "kavlan-12": "10.11.200.2",
-      "kavlan-13": "10.15.200.2",
-      "kavlan-14": "10.19.200.2",
-      "kavlan-16": "10.27.200.2",
-      "kavlan-18": "10.35.200.2",
-      "kavlan-19": "10.39.200.2",
-      "kavlan-2": "192.168.209.2",
-      "kavlan-20": "10.43.200.2",
-      "kavlan-21": "10.47.200.2",
-      "kavlan-3": "192.168.225.2",
-      "kavlan-4": "10.16.1.2",
-      "kavlan-5": "10.16.65.2",
-      "kavlan-6": "10.16.129.2",
-      "kavlan-7": "10.16.193.2",
-      "kavlan-8": "10.17.1.2",
-      "kavlan-9": "10.17.65.2"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.65.2",
-      "kavlan": true,
-      "mac": "00:e0:81:b2:c4:bc",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "griffon-2.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgriffon1",
-      "switch_port": "GigabitEthernet1/0/2",
-      "vendor": "intel",
-      "version": "80003ES2LAN"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:b2:c4:bd",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "switch": null,
-      "switch_port": null,
-      "vendor": "intel",
-      "version": "BCM5721"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:65",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "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:02:80:66",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.65.2",
-      "kavlan": false,
-      "mac": "00:e0:81:4f:e2:fc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "griffon-2-bmc.nancy.grid5000.fr",
-      "vendor": "Tyan",
-      "version": "M3296"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "cstate_max_id": null,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7963000000.0,
-    "node_flops": 52500000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "L5420"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "griffon-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca34de9068f",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3OA5CA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "griffon-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
deleted file mode 100644
index 936b69887b0bdcb62a44e98f2d300df30c27a350..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/21/2009",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "V1.05"
-  },
-  "chassis": {
-    "manufacturer": "TYAN Computer Corporation",
-    "name": "S5393"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.21",
-      "kavlan-11": "10.7.200.21",
-      "kavlan-12": "10.11.200.21",
-      "kavlan-13": "10.15.200.21",
-      "kavlan-14": "10.19.200.21",
-      "kavlan-16": "10.27.200.21",
-      "kavlan-18": "10.35.200.21",
-      "kavlan-19": "10.39.200.21",
-      "kavlan-2": "192.168.209.21",
-      "kavlan-20": "10.43.200.21",
-      "kavlan-21": "10.47.200.21",
-      "kavlan-3": "192.168.225.21",
-      "kavlan-4": "10.16.1.21",
-      "kavlan-5": "10.16.65.21",
-      "kavlan-6": "10.16.129.21",
-      "kavlan-7": "10.16.193.21",
-      "kavlan-8": "10.17.1.21",
-      "kavlan-9": "10.17.65.21"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.65.21",
-      "kavlan": true,
-      "mac": "00:e0:81:b2:bf:c2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "griffon-21.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgriffon1",
-      "switch_port": "GigabitEthernet1/0/35",
-      "vendor": "intel",
-      "version": "80003ES2LAN"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:b2:bf:c3",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "switch": null,
-      "switch_port": null,
-      "vendor": "intel",
-      "version": "BCM5721"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4f",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "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:03:30:50",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.65.21",
-      "kavlan": false,
-      "mac": "00:e0:81:4f:e2:fb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "griffon-21-bmc.nancy.grid5000.fr",
-      "vendor": "Tyan",
-      "version": "M3296"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "cstate_max_id": null,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7963000000.0,
-    "node_flops": 52500000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "L5420"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "griffon-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca346e8f8a6",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDT72103",
-      "rev": "ST2OA3AA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "griffon-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
deleted file mode 100644
index 8b58ef3ef5c74d0de21dcc3607e7c008cfd2d053..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/21/2009",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "V1.05"
-  },
-  "chassis": {
-    "manufacturer": "TYAN Computer Corporation",
-    "name": "S5393"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.4",
-      "kavlan-11": "10.7.200.4",
-      "kavlan-12": "10.11.200.4",
-      "kavlan-13": "10.15.200.4",
-      "kavlan-14": "10.19.200.4",
-      "kavlan-16": "10.27.200.4",
-      "kavlan-18": "10.35.200.4",
-      "kavlan-19": "10.39.200.4",
-      "kavlan-2": "192.168.209.4",
-      "kavlan-20": "10.43.200.4",
-      "kavlan-21": "10.47.200.4",
-      "kavlan-3": "192.168.225.4",
-      "kavlan-4": "10.16.1.4",
-      "kavlan-5": "10.16.65.4",
-      "kavlan-6": "10.16.129.4",
-      "kavlan-7": "10.16.193.4",
-      "kavlan-8": "10.17.1.4",
-      "kavlan-9": "10.17.65.4"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.65.4",
-      "kavlan": true,
-      "mac": "00:e0:81:b2:bf:e4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "griffon-4.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgriffon1",
-      "switch_port": "GigabitEthernet1/0/4",
-      "vendor": "intel",
-      "version": "80003ES2LAN"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:b2:bf:e5",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "switch": null,
-      "switch_port": null,
-      "vendor": "intel",
-      "version": "BCM5721"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:69",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "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:02:80:6a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.65.4",
-      "kavlan": false,
-      "mac": "00:e0:81:4f:e3:7a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "griffon-4-bmc.nancy.grid5000.fr",
-      "vendor": "Tyan",
-      "version": "M3296"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "cstate_max_id": null,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7963000000.0,
-    "node_flops": 52500000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "L5420"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "griffon-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3OA5CA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "griffon-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
deleted file mode 100644
index d84e414e46ae95cb784e99fb210a9033870ca3d9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/21/2009",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "V1.05"
-  },
-  "chassis": {
-    "manufacturer": "TYAN Computer Corporation",
-    "name": "S5393",
-    "serial": 812530011
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.6",
-      "kavlan-11": "10.7.200.6",
-      "kavlan-12": "10.11.200.6",
-      "kavlan-13": "10.15.200.6",
-      "kavlan-14": "10.19.200.6",
-      "kavlan-16": "10.27.200.6",
-      "kavlan-18": "10.35.200.6",
-      "kavlan-19": "10.39.200.6",
-      "kavlan-2": "192.168.209.6",
-      "kavlan-20": "10.43.200.6",
-      "kavlan-21": "10.47.200.6",
-      "kavlan-3": "192.168.225.6",
-      "kavlan-4": "10.16.1.6",
-      "kavlan-5": "10.16.65.6",
-      "kavlan-6": "10.16.129.6",
-      "kavlan-7": "10.16.193.6",
-      "kavlan-8": "10.17.1.6",
-      "kavlan-9": "10.17.65.6"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.65.6",
-      "kavlan": true,
-      "mac": "00:e0:81:b1:c4:7e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "griffon-6.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgriffon1",
-      "switch_port": "GigabitEthernet1/0/6",
-      "vendor": "intel",
-      "version": "80003ES2LAN"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:b1:c4:7f",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "switch": null,
-      "switch_port": null,
-      "vendor": "intel",
-      "version": "BCM5721"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ad",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies",
-      "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:02:80:ae",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies",
-      "version": "MT26418"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.65.6",
-      "kavlan": false,
-      "mac": "00:e0:81:4f:e3:74",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "griffon-6-bmc.nancy.grid5000.fr",
-      "vendor": "Tyan",
-      "version": "M3296"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "cstate_max_id": null,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7963000000.0,
-    "node_flops": 52500000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "L5420"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "griffon-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3OA5CA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "griffon-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
deleted file mode 100644
index aef914a9545b76c2b87f6ad2eb7a9202b689160d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/21/2009",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "V1.05"
-  },
-  "chassis": {
-    "manufacturer": "TYAN Computer Corporation",
-    "name": "S5393"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.60",
-      "kavlan-11": "10.7.200.60",
-      "kavlan-12": "10.11.200.60",
-      "kavlan-13": "10.15.200.60",
-      "kavlan-14": "10.19.200.60",
-      "kavlan-16": "10.27.200.60",
-      "kavlan-18": "10.35.200.60",
-      "kavlan-19": "10.39.200.60",
-      "kavlan-2": "192.168.209.60",
-      "kavlan-20": "10.43.200.60",
-      "kavlan-21": "10.47.200.60",
-      "kavlan-3": "192.168.225.60",
-      "kavlan-4": "10.16.1.60",
-      "kavlan-5": "10.16.65.60",
-      "kavlan-6": "10.16.129.60",
-      "kavlan-7": "10.16.193.60",
-      "kavlan-8": "10.17.1.60",
-      "kavlan-9": "10.17.65.60"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.65.60",
-      "kavlan": true,
-      "mac": "00:e0:81:b2:bf:f4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "griffon-60.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgriffon1",
-      "switch_port": "GigabitEthernet1/0/13",
-      "vendor": "intel",
-      "version": "80003ES2LAN"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:b2:bf:f5",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "switch": null,
-      "switch_port": null,
-      "vendor": "intel",
-      "version": "BCM5721"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:41",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "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:03:17:42",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.65.60",
-      "kavlan": false,
-      "mac": "00:e0:81:4f:e3:90",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "griffon-60-bmc.nancy.grid5000.fr",
-      "vendor": "Tyan",
-      "version": "M3296"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "cstate_max_id": null,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7963000000.0,
-    "node_flops": 52500000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "L5420"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "griffon-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3OA5CA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "griffon-60"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
deleted file mode 100644
index 9bfa22914086af9228fd1aad1647a283b5e99a6a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/21/2009",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "V1.05"
-  },
-  "chassis": {
-    "manufacturer": "TYAN Computer Corporation",
-    "name": "S5393"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.9",
-      "kavlan-11": "10.7.200.9",
-      "kavlan-12": "10.11.200.9",
-      "kavlan-13": "10.15.200.9",
-      "kavlan-14": "10.19.200.9",
-      "kavlan-16": "10.27.200.9",
-      "kavlan-18": "10.35.200.9",
-      "kavlan-19": "10.39.200.9",
-      "kavlan-2": "192.168.209.9",
-      "kavlan-20": "10.43.200.9",
-      "kavlan-21": "10.47.200.9",
-      "kavlan-3": "192.168.225.9",
-      "kavlan-4": "10.16.1.9",
-      "kavlan-5": "10.16.65.9",
-      "kavlan-6": "10.16.129.9",
-      "kavlan-7": "10.16.193.9",
-      "kavlan-8": "10.17.1.9",
-      "kavlan-9": "10.17.65.9"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.65.9",
-      "kavlan": true,
-      "mac": "00:e0:81:b2:c5:76",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "griffon-9.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgriffon1",
-      "switch_port": "GigabitEthernet1/0/10",
-      "vendor": "intel",
-      "version": "80003ES2LAN"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:b2:c5:77",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "switch": null,
-      "switch_port": null,
-      "vendor": "intel",
-      "version": "BCM5721"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5d",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "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:02:80:5e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.65.9",
-      "kavlan": false,
-      "mac": "00:e0:81:4f:e2:fe",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "griffon-9-bmc.nancy.grid5000.fr",
-      "vendor": "Tyan",
-      "version": "M3296"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "cstate_max_id": null,
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7963000000.0,
-    "node_flops": 52500000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "L5420"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "griffon-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3OA5CA",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "griffon-9"
-}
\ No newline at end of file
diff --git a/grid5000-all.json b/grid5000-all.json
index bc4585eab99fdccf7396c32c978d13f01f883546..4777dd177f61a27b74411980b70934604b123b1f 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -105055,35 +105055,40 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.65.1",
+                  "mac": "00:e0:81:4f:e3:13",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "vendor": "Tyan",
+                  "version": "M3296"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.65.1",
-                  "kavlan": true,
                   "mac": "00:e0:81:b2:c1:88",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "griffon-1.nancy.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "sgriffon1",
-                  "switch_port": "GigabitEthernet1/0/1",
                   "vendor": "intel",
                   "version": "80003ES2LAN"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:b2:c1:89",
                   "management": false,
                   "mountable": false,
@@ -105093,13 +105098,11 @@
                   "vendor": "intel",
                   "version": "BCM5721"
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f1",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
@@ -105107,35 +105110,19 @@
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
                 },
-                {
-                  "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:03:18:f2",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.65.1",
-                  "kavlan": false,
-                  "mac": "00:e0:81:4f:e3:13",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "griffon-1-bmc.nancy.grid5000.fr",
-                  "vendor": "Tyan",
-                  "version": "M3296"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
@@ -105145,12 +105132,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": false
               },
+              "pdu": [
+                {
+                  "port": 4,
+                  "uid": "griffon-pdu2"
+                }
+              ],
               "performance": {
                 "core_flops": 7963000000.0,
                 "node_flops": 52500000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 6291456,
@@ -105166,23 +105158,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "griffon-pdu2"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "/dev/disk/by-id/wwn-0x5000cca34de7b185",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDP72503",
@@ -105191,7 +105173,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -105201,9 +105183,7 @@
                   "default"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "griffon-1"
+              }
             },
             "griffon-10": {
               "architecture": {
@@ -105250,35 +105230,40 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.65.10",
+                  "mac": "00:e0:81:4f:ca:9e",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "vendor": "Tyan",
+                  "version": "M3296"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.65.10",
-                  "kavlan": true,
                   "mac": "00:e0:81:b2:c0:a4",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "griffon-10.nancy.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "sgriffon1",
-                  "switch_port": "GigabitEthernet1/0/9",
                   "vendor": "intel",
                   "version": "80003ES2LAN"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:b2:c0:a5",
                   "management": false,
                   "mountable": false,
@@ -105288,13 +105273,11 @@
                   "vendor": "intel",
                   "version": "BCM5721"
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:59",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
@@ -105302,35 +105285,19 @@
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
                 },
-                {
-                  "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:02:7f:5a",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.65.10",
-                  "kavlan": false,
-                  "mac": "00:e0:81:4f:ca:9e",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "griffon-10-bmc.nancy.grid5000.fr",
-                  "vendor": "Tyan",
-                  "version": "M3296"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
@@ -105340,12 +105307,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": false
               },
+              "pdu": [
+                {
+                  "port": 11,
+                  "uid": "griffon-pdu1"
+                }
+              ],
               "performance": {
                 "core_flops": 7963000000.0,
                 "node_flops": 52500000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 6291456,
@@ -105361,23 +105333,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "griffon-pdu1"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "/dev/disk/by-id/wwn-0x5000cca34de89582",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDP72503",
@@ -105386,7 +105348,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -105396,9 +105358,7 @@
                   "default"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "griffon-10"
+              }
             },
             "griffon-11": {
               "architecture": {
@@ -107211,35 +107171,40 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.65.2",
+                  "mac": "00:e0:81:4f:e2:fc",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "vendor": "Tyan",
+                  "version": "M3296"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.65.2",
-                  "kavlan": true,
                   "mac": "00:e0:81:b2:c4:bc",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "griffon-2.nancy.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "sgriffon1",
-                  "switch_port": "GigabitEthernet1/0/2",
                   "vendor": "intel",
                   "version": "80003ES2LAN"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:b2:c4:bd",
                   "management": false,
                   "mountable": false,
@@ -107249,13 +107214,11 @@
                   "vendor": "intel",
                   "version": "BCM5721"
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:65",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
@@ -107263,35 +107226,19 @@
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
                 },
-                {
-                  "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:02:80:66",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.65.2",
-                  "kavlan": false,
-                  "mac": "00:e0:81:4f:e2:fc",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "griffon-2-bmc.nancy.grid5000.fr",
-                  "vendor": "Tyan",
-                  "version": "M3296"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
@@ -107301,12 +107248,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": false
               },
+              "pdu": [
+                {
+                  "port": 3,
+                  "uid": "griffon-pdu2"
+                }
+              ],
               "performance": {
                 "core_flops": 7963000000.0,
                 "node_flops": 52500000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 6291456,
@@ -107322,23 +107274,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "griffon-pdu2"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "/dev/disk/by-id/wwn-0x5000cca34de9068f",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDP72503",
@@ -107347,7 +107289,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -107357,9 +107299,7 @@
                   "default"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "griffon-2"
+              }
             },
             "griffon-20": {
               "architecture": {
@@ -107601,35 +107541,40 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.65.21",
+                  "mac": "00:e0:81:4f:e2:fb",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "vendor": "Tyan",
+                  "version": "M3296"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.65.21",
-                  "kavlan": true,
                   "mac": "00:e0:81:b2:bf:c2",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "griffon-21.nancy.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "sgriffon1",
-                  "switch_port": "GigabitEthernet1/0/35",
                   "vendor": "intel",
                   "version": "80003ES2LAN"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:b2:bf:c3",
                   "management": false,
                   "mountable": false,
@@ -107639,13 +107584,11 @@
                   "vendor": "intel",
                   "version": "BCM5721"
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4f",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
@@ -107653,35 +107596,19 @@
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
                 },
-                {
-                  "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:03:30:50",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.65.21",
-                  "kavlan": false,
-                  "mac": "00:e0:81:4f:e2:fb",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "griffon-21-bmc.nancy.grid5000.fr",
-                  "vendor": "Tyan",
-                  "version": "M3296"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
@@ -107691,12 +107618,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": false
               },
+              "pdu": [
+                {
+                  "port": 23,
+                  "uid": "griffon-pdu1"
+                }
+              ],
               "performance": {
                 "core_flops": 7963000000.0,
                 "node_flops": 52500000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 6291456,
@@ -107712,23 +107644,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "griffon-pdu1"
-                      }
-                    ]
-                  }
+                  "available": true
                 }
               },
-              "storage_devices": [
-                {
+              "status": "retired",
+              "storage_devices": {
+                "sda": {
                   "by_id": "/dev/disk/by-id/wwn-0x5000cca346e8f8a6",
-                  "device": "sda",
                   "driver": "ahci",
                   "interface": "SATA II",
                   "model": "Hitachi HDT72103",
@@ -107737,7 +107659,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -107747,9 +107669,7 @@
                   "default"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "griffon-21"
+              }
             },
             "griffon-22": {
               "architecture": {
@@ -109543,6 +109463,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109641,6 +109565,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109739,6 +109667,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109837,6 +109769,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109935,6 +109871,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110033,6 +109973,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110131,6 +110075,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110229,6 +110177,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110327,6 +110279,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110425,6 +110381,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110564,35 +110524,40 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.65.4",
+                  "mac": "00:e0:81:4f:e3:7a",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "vendor": "Tyan",
+                  "version": "M3296"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.65.4",
-                  "kavlan": true,
                   "mac": "00:e0:81:b2:bf:e4",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "griffon-4.nancy.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "sgriffon1",
-                  "switch_port": "GigabitEthernet1/0/4",
                   "vendor": "intel",
                   "version": "80003ES2LAN"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:b2:bf:e5",
                   "management": false,
                   "mountable": false,
@@ -110602,13 +110567,11 @@
                   "vendor": "intel",
                   "version": "BCM5721"
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:69",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
@@ -110616,35 +110579,19 @@
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
                 },
-                {
-                  "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:02:80:6a",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.65.4",
-                  "kavlan": false,
-                  "mac": "00:e0:81:4f:e3:7a",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "griffon-4-bmc.nancy.grid5000.fr",
-                  "vendor": "Tyan",
-                  "version": "M3296"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
@@ -110654,12 +110601,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": false
               },
+              "pdu": [
+                {
+                  "port": 1,
+                  "uid": "griffon-pdu2"
+                }
+              ],
               "performance": {
                 "core_flops": 7963000000.0,
                 "node_flops": 52500000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 6291456,
@@ -110675,23 +110627,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "griffon-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 HDP72503",
@@ -110700,7 +110642,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -110710,14 +110652,16 @@
                   "default"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "griffon-4"
+              }
             },
             "griffon-40": {
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110816,6 +110760,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110914,6 +110862,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111012,6 +110964,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111110,6 +111066,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111208,6 +111168,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111306,6 +111270,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111404,6 +111372,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111502,6 +111474,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111600,6 +111576,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111900,6 +111880,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111998,6 +111982,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112096,6 +112084,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112194,6 +112186,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112292,6 +112288,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112390,6 +112390,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112488,6 +112492,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112586,6 +112594,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113130,35 +113142,40 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.65.6",
+                  "mac": "00:e0:81:4f:e3:74",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "vendor": "Tyan",
+                  "version": "M3296"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.65.6",
-                  "kavlan": true,
                   "mac": "00:e0:81:b1:c4:7e",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "griffon-6.nancy.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "sgriffon1",
-                  "switch_port": "GigabitEthernet1/0/6",
                   "vendor": "intel",
                   "version": "80003ES2LAN"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:b1:c4:7f",
                   "management": false,
                   "mountable": false,
@@ -113168,13 +113185,11 @@
                   "vendor": "intel",
                   "version": "BCM5721"
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ad",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
@@ -113183,13 +113198,11 @@
                   "vendor": "Mellanox Technologies",
                   "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:02:80:ae",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
@@ -113197,22 +113210,8 @@
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies",
                   "version": "MT26418"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.65.6",
-                  "kavlan": false,
-                  "mac": "00:e0:81:4f:e3:74",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "griffon-6-bmc.nancy.grid5000.fr",
-                  "vendor": "Tyan",
-                  "version": "M3296"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
@@ -113222,12 +113221,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": false
               },
+              "pdu": [
+                {
+                  "port": 4,
+                  "uid": "griffon-pdu1"
+                }
+              ],
               "performance": {
                 "core_flops": 7963000000.0,
                 "node_flops": 52500000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 6291456,
@@ -113243,23 +113247,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "griffon-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 HDP72503",
@@ -113268,7 +113262,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -113278,9 +113272,7 @@
                   "default"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "griffon-6"
+              }
             },
             "griffon-60": {
               "architecture": {
@@ -113327,35 +113319,40 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.65.60",
+                  "mac": "00:e0:81:4f:e3:90",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "vendor": "Tyan",
+                  "version": "M3296"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.65.60",
-                  "kavlan": true,
                   "mac": "00:e0:81:b2:bf:f4",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "griffon-60.nancy.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "sgriffon1",
-                  "switch_port": "GigabitEthernet1/0/13",
                   "vendor": "intel",
                   "version": "80003ES2LAN"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:b2:bf:f5",
                   "management": false,
                   "mountable": false,
@@ -113364,14 +113361,12 @@
                   "switch_port": null,
                   "vendor": "intel",
                   "version": "BCM5721"
-                },
-                {
-                  "device": "ib0",
+                },
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:41",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
@@ -113379,35 +113374,19 @@
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
                 },
-                {
-                  "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:03:17:42",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.65.60",
-                  "kavlan": false,
-                  "mac": "00:e0:81:4f:e3:90",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "griffon-60-bmc.nancy.grid5000.fr",
-                  "vendor": "Tyan",
-                  "version": "M3296"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
@@ -113417,12 +113396,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": false
               },
+              "pdu": [
+                {
+                  "port": 5,
+                  "uid": "griffon-pdu2"
+                }
+              ],
               "performance": {
                 "core_flops": 7963000000.0,
                 "node_flops": 52500000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 6291456,
@@ -113438,23 +113422,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "griffon-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 HDP72503",
@@ -113463,7 +113437,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -113473,14 +113447,16 @@
                   "default"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "griffon-60"
+              }
             },
             "griffon-61": {
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113579,6 +113555,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113677,6 +113657,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113775,6 +113759,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113873,6 +113861,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113971,6 +113963,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114069,6 +114065,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114167,6 +114167,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114265,6 +114269,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114565,6 +114573,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114663,6 +114675,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114761,6 +114777,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114859,6 +114879,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114957,6 +114981,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115055,6 +115083,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115153,6 +115185,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115251,6 +115287,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115349,6 +115389,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115447,6 +115491,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115747,6 +115795,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115845,6 +115897,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115943,6 +115999,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116041,6 +116101,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116139,6 +116203,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116237,6 +116305,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116335,6 +116407,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116433,6 +116509,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116531,6 +116611,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116629,6 +116713,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116768,35 +116856,40 @@
                 "ram_size": 17179869184
               },
               "monitoring": {
+                "metric": "power",
                 "wattmeter": "shared"
               },
-              "network_adapters": [
-                {
+              "network_adapters": {
+                "bmc": {
+                  "enabled": true,
+                  "interface": "Ethernet",
+                  "ip": "172.17.65.9",
+                  "mac": "00:e0:81:4f:e2:fe",
+                  "management": true,
+                  "mountable": false,
+                  "mounted": false,
+                  "vendor": "Tyan",
+                  "version": "M3296"
+                },
+                "eth0": {
                   "bridged": true,
-                  "device": "eth0",
                   "driver": "e1000e",
                   "enabled": true,
                   "interface": "Ethernet",
                   "ip": "172.16.65.9",
-                  "kavlan": true,
                   "mac": "00:e0:81:b2:c5:76",
                   "management": false,
                   "mountable": true,
                   "mounted": true,
-                  "network_address": "griffon-9.nancy.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "sgriffon1",
-                  "switch_port": "GigabitEthernet1/0/10",
                   "vendor": "intel",
                   "version": "80003ES2LAN"
                 },
-                {
+                "eth1": {
                   "bridged": false,
-                  "device": "eth1",
                   "driver": "e1000e",
                   "enabled": false,
                   "interface": "Ethernet",
-                  "kavlan": false,
                   "mac": "00:e0:81:b2:c5:77",
                   "management": false,
                   "mountable": false,
@@ -116806,13 +116899,11 @@
                   "vendor": "intel",
                   "version": "BCM5721"
                 },
-                {
-                  "device": "ib0",
+                "ib0": {
                   "driver": "mlx4_core",
                   "enabled": false,
                   "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5d",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
@@ -116820,35 +116911,19 @@
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
                 },
-                {
-                  "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:02:80:5e",
                   "interface": "InfiniBand",
-                  "kavlan": false,
                   "management": false,
                   "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
                   "vendor": "Mellanox Technologies"
-                },
-                {
-                  "device": "bmc",
-                  "enabled": true,
-                  "interface": "Ethernet",
-                  "ip": "172.17.65.9",
-                  "kavlan": false,
-                  "mac": "00:e0:81:4f:e2:fe",
-                  "management": true,
-                  "mountable": false,
-                  "mounted": false,
-                  "network_address": "griffon-9-bmc.nancy.grid5000.fr",
-                  "vendor": "Tyan",
-                  "version": "M3296"
                 }
-              ],
+              },
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
@@ -116858,12 +116933,17 @@
                 "pstate_governor": "performance",
                 "turboboost_enabled": false
               },
+              "pdu": [
+                {
+                  "port": 10,
+                  "uid": "griffon-pdu1"
+                }
+              ],
               "performance": {
                 "core_flops": 7963000000.0,
                 "node_flops": 52500000000.0
               },
               "processor": {
-                "cache_l1": null,
                 "cache_l1d": 32768,
                 "cache_l1i": 32768,
                 "cache_l2": 6291456,
@@ -116879,23 +116959,13 @@
               },
               "sensors": {
                 "power": {
-                  "available": true,
-                  "via": {
-                    "api": {
-                      "metric": "power"
-                    },
-                    "pdu": [
-                      {
-                        "uid": "griffon-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 HDP72503",
@@ -116904,7 +116974,7 @@
                   "storage": "HDD",
                   "vendor": "Hitachi"
                 }
-              ],
+              },
               "supported_job_types": {
                 "besteffort": true,
                 "deploy": true,
@@ -116914,14 +116984,16 @@
                   "default"
                 ],
                 "virtual": "ivt"
-              },
-              "type": "node",
-              "uid": "griffon-9"
+              }
             },
             "griffon-90": {
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -117020,6 +117092,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -117118,6 +117194,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
diff --git a/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml b/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
index 2ff702c2e65ae7e78f804995535b48ca44127675..1702c91fe8a161aaaafe75b69a076e0e1566f7a1 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
@@ -90,16 +90,6 @@ nodes:
         management: true
         vendor: Tyan
         version: M3296
-
-# Retired nodes
-  griffon-3:
-    status: retired
-  griffon-[12-13]:
-    status: retired
-  griffon-[30-57]:
-    status: retired
-  griffon-[61-92]:
-    status: retired
 # centralize all IB guids here
   griffon-90:
     network_adapters:
diff --git a/input/grid5000/sites/nancy/clusters/griffon/griffon_retired.yaml.erb b/input/grid5000/sites/nancy/clusters/griffon/griffon_retired.yaml.erb
new file mode 100644
index 0000000000000000000000000000000000000000..f1cebc7281fd9ad34435c7351bdbc512853d7f68
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/griffon/griffon_retired.yaml.erb
@@ -0,0 +1,5 @@
+nodes:
+<% [10 ,12 ,13 ,1 ,21 ,2 ,30 ,31 ,32 ,33 ,34 ,35 ,36 ,37 ,38 ,39 ,3 ,40 ,41 ,42 ,43 ,44 ,45 ,46 ,47 ,48 ,49 ,4 ,50 ,51 ,52 ,53 ,54 ,55 ,56 ,57 ,60 ,61 ,62 ,63 ,64 ,65 ,66 ,67 ,68 ,69 ,6 ,70 ,71 ,72 ,73 ,74 ,75 ,76 ,77 ,78 ,79 ,80 ,81 ,82 ,83 ,84 ,85 ,86 ,87 ,88 ,89 ,90 ,91 ,92 ,9].each { |i| %>
+  griffon-<%= i %>:
+    status: retired
+<% } %>