diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 80968b641f8559363eed7a62d2b192ea8e3c9df1..7147368d6334390aac724ba3f08094f4b15628eb 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -1671,6 +1671,61 @@
       ]
     }
   },
+  "esterel3": {
+    "besteffort": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat",
+        "coast",
+        "avalon",
+        "chroma",
+        "emeraude",
+        "maracas",
+        "inria-chile",
+        "inria-dsi",
+        "inria-sidf",
+        "swh",
+        "tadaam"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-nancy",
+        "mc-lyon",
+        "mc-economic-activity",
+        "mc-sophia",
+        "mc-lille",
+        "mc-grenoble",
+        "mc-paris",
+        "mc-saclay",
+        "mc-bordeaux",
+        "mc-siege",
+        "mc-guest",
+        "slices-fr-grenoble",
+        "slices-fr-lille",
+        "slices-fr-lyon",
+        "slices-fr-nancy",
+        "slices-fr-nantes",
+        "slices-fr-rennes",
+        "slices-fr-sophia",
+        "slices-fr-strasbourg",
+        "slices-fr-toulouse"
+      ]
+    },
+    "p1": {
+      "ggas": [
+        "graphdeco"
+      ],
+      "sites": [
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    }
+  },
   "esterel4": {
     "besteffort": {
       "ggas": [
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
new file mode 100644
index 0000000000000000000000000000000000000000..1face6434c408d9b7369be9ebf919532e91c30b1
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
@@ -0,0 +1,66 @@
+{
+  "boot_type": "bios",
+  "created_at": "Thu, 20 Mar 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": true,
+  "manufactured_at": "2016-03-28",
+  "metrics": [
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge C6320",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2640 v3, 8 cores/CPU, 64GB RAM, 1117GB HDD, 1 x 10Gb Ethernet",
+  "priority": 201603,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "chartreuse3",
+  "warranty_end": "2019-03-28"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..d36a2a1782d654f0cb2535f484a28c77d616a3af
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
@@ -0,0 +1,212 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/21/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-03-28",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6320",
+    "serial": "16MCWC2",
+    "warranty_end": "2019-03-28"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.9",
+      "kavlan-11": "10.7.247.9",
+      "kavlan-12": "10.11.247.9",
+      "kavlan-13": "10.15.247.9",
+      "kavlan-14": "10.19.247.9",
+      "kavlan-16": "10.27.247.9",
+      "kavlan-17": "10.31.247.9",
+      "kavlan-18": "10.35.247.9",
+      "kavlan-2": "192.168.214.9",
+      "kavlan-20": "10.43.247.9",
+      "kavlan-21": "10.47.247.9",
+      "kavlan-3": "192.168.230.9",
+      "kavlan-4": "10.4.7.9",
+      "kavlan-5": "10.4.71.9",
+      "kavlan-6": "10.4.135.9",
+      "kavlan-7": "10.4.199.9",
+      "kavlan-8": "10.5.7.9",
+      "kavlan-9": "10.5.71.9"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::9",
+      "kavlan-11": "2001:660:4406:1a0:10b::9",
+      "kavlan-12": "2001:660:4406:2a0:10b::9",
+      "kavlan-13": "2001:660:4406:4a0:10b::9",
+      "kavlan-14": "2001:660:4406:5a0:10b::9",
+      "kavlan-16": "2001:660:4406:7a0:10b::9",
+      "kavlan-17": "2001:660:4406:9a0:10b::9",
+      "kavlan-18": "2001:660:4406:8a0:10b::9",
+      "kavlan-2": "2001:660:4406:181:b::9",
+      "kavlan-20": "2001:660:4406:3a0:10b::9",
+      "kavlan-21": "2001:660:4406:6a0:10b::9",
+      "kavlan-3": "2001:660:4406:182:b::9",
+      "kavlan-4": "2001:660:4406:190:b::9",
+      "kavlan-5": "2001:660:4406:191:b::9",
+      "kavlan-6": "2001:660:4406:192:b::9",
+      "kavlan-7": "2001:660:4406:193:b::9",
+      "kavlan-8": "2001:660:4406:194:b::9",
+      "kavlan-9": "2001:660:4406:195:b::9"
+    }
+  },
+  "main_memory": {
+    "ram_size": 68719476736
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "ixgbe",
+      "enabled": true,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "ip": "172.16.26.9",
+      "ip6": "2001:660:4406:100:b::9",
+      "kavlan": true,
+      "mac": "00:8c:fa:fd:6f:b6",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "chartreuse3-1.grenoble.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "switch": "imag-1b-F3-prod-01",
+      "switch_port": "1/1/12",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "ixgbe",
+      "enabled": false,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:8c:fa:fd:6f:b8",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.9",
+      "kavlan": false,
+      "mac": "00:8c:fa:fd:6f:ba",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse3-1-bmc.grenoble.grid5000.fr"
+    }
+  ],
+  "nodeset": "chartreuse3",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 41600000000,
+    "node_flops": 665600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 20971520,
+    "clock_speed": 2600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Haswell",
+    "microcode": "0x49",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz",
+    "vendor": "Intel",
+    "version": "E5-2640 v3"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e71a54f",
+      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+      "firmware_version": "IS06",
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "ST1200MM0007",
+      "size": 1200243695616,
+      "storage": "HDD",
+      "vendor": "Seagate"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "chartreuse3-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..2e3eff7caac530365994b2a5036b48135c78ff0f
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
@@ -0,0 +1,212 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/21/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-03-28",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6320",
+    "serial": "16P9WC2",
+    "warranty_end": "2019-03-28"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.10",
+      "kavlan-11": "10.7.247.10",
+      "kavlan-12": "10.11.247.10",
+      "kavlan-13": "10.15.247.10",
+      "kavlan-14": "10.19.247.10",
+      "kavlan-16": "10.27.247.10",
+      "kavlan-17": "10.31.247.10",
+      "kavlan-18": "10.35.247.10",
+      "kavlan-2": "192.168.214.10",
+      "kavlan-20": "10.43.247.10",
+      "kavlan-21": "10.47.247.10",
+      "kavlan-3": "192.168.230.10",
+      "kavlan-4": "10.4.7.10",
+      "kavlan-5": "10.4.71.10",
+      "kavlan-6": "10.4.135.10",
+      "kavlan-7": "10.4.199.10",
+      "kavlan-8": "10.5.7.10",
+      "kavlan-9": "10.5.71.10"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::a",
+      "kavlan-11": "2001:660:4406:1a0:10b::a",
+      "kavlan-12": "2001:660:4406:2a0:10b::a",
+      "kavlan-13": "2001:660:4406:4a0:10b::a",
+      "kavlan-14": "2001:660:4406:5a0:10b::a",
+      "kavlan-16": "2001:660:4406:7a0:10b::a",
+      "kavlan-17": "2001:660:4406:9a0:10b::a",
+      "kavlan-18": "2001:660:4406:8a0:10b::a",
+      "kavlan-2": "2001:660:4406:181:b::a",
+      "kavlan-20": "2001:660:4406:3a0:10b::a",
+      "kavlan-21": "2001:660:4406:6a0:10b::a",
+      "kavlan-3": "2001:660:4406:182:b::a",
+      "kavlan-4": "2001:660:4406:190:b::a",
+      "kavlan-5": "2001:660:4406:191:b::a",
+      "kavlan-6": "2001:660:4406:192:b::a",
+      "kavlan-7": "2001:660:4406:193:b::a",
+      "kavlan-8": "2001:660:4406:194:b::a",
+      "kavlan-9": "2001:660:4406:195:b::a"
+    }
+  },
+  "main_memory": {
+    "ram_size": 68719476736
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "ixgbe",
+      "enabled": true,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "ip": "172.16.26.10",
+      "ip6": "2001:660:4406:100:b::a",
+      "kavlan": true,
+      "mac": "00:8c:fa:fe:97:4c",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "chartreuse3-2.grenoble.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "switch": "imag-1b-F3-prod-01",
+      "switch_port": "1/1/9",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "ixgbe",
+      "enabled": false,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:8c:fa:fe:97:4e",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.10",
+      "kavlan": false,
+      "mac": "00:8c:fa:fe:97:50",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse3-2-bmc.grenoble.grid5000.fr"
+    }
+  ],
+  "nodeset": "chartreuse3",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 41600000000,
+    "node_flops": 665600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 20971520,
+    "clock_speed": 2600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Haswell",
+    "microcode": "0x49",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz",
+    "vendor": "Intel",
+    "version": "E5-2640 v3"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e7fd4cf",
+      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+      "firmware_version": "IS06",
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "ST1200MM0007",
+      "size": 1200243695616,
+      "storage": "HDD",
+      "vendor": "Seagate"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "chartreuse3-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..1c15072503a468ba1126d38c8e74a60539951ab6
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
@@ -0,0 +1,212 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/21/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-03-28",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6320",
+    "serial": "16NGWC2",
+    "warranty_end": "2019-03-28"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.11",
+      "kavlan-11": "10.7.247.11",
+      "kavlan-12": "10.11.247.11",
+      "kavlan-13": "10.15.247.11",
+      "kavlan-14": "10.19.247.11",
+      "kavlan-16": "10.27.247.11",
+      "kavlan-17": "10.31.247.11",
+      "kavlan-18": "10.35.247.11",
+      "kavlan-2": "192.168.214.11",
+      "kavlan-20": "10.43.247.11",
+      "kavlan-21": "10.47.247.11",
+      "kavlan-3": "192.168.230.11",
+      "kavlan-4": "10.4.7.11",
+      "kavlan-5": "10.4.71.11",
+      "kavlan-6": "10.4.135.11",
+      "kavlan-7": "10.4.199.11",
+      "kavlan-8": "10.5.7.11",
+      "kavlan-9": "10.5.71.11"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::b",
+      "kavlan-11": "2001:660:4406:1a0:10b::b",
+      "kavlan-12": "2001:660:4406:2a0:10b::b",
+      "kavlan-13": "2001:660:4406:4a0:10b::b",
+      "kavlan-14": "2001:660:4406:5a0:10b::b",
+      "kavlan-16": "2001:660:4406:7a0:10b::b",
+      "kavlan-17": "2001:660:4406:9a0:10b::b",
+      "kavlan-18": "2001:660:4406:8a0:10b::b",
+      "kavlan-2": "2001:660:4406:181:b::b",
+      "kavlan-20": "2001:660:4406:3a0:10b::b",
+      "kavlan-21": "2001:660:4406:6a0:10b::b",
+      "kavlan-3": "2001:660:4406:182:b::b",
+      "kavlan-4": "2001:660:4406:190:b::b",
+      "kavlan-5": "2001:660:4406:191:b::b",
+      "kavlan-6": "2001:660:4406:192:b::b",
+      "kavlan-7": "2001:660:4406:193:b::b",
+      "kavlan-8": "2001:660:4406:194:b::b",
+      "kavlan-9": "2001:660:4406:195:b::b"
+    }
+  },
+  "main_memory": {
+    "ram_size": 68719476736
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "ixgbe",
+      "enabled": true,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "ip": "172.16.26.11",
+      "ip6": "2001:660:4406:100:b::b",
+      "kavlan": true,
+      "mac": "00:8c:fa:fd:7c:ac",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "chartreuse3-3.grenoble.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "switch": "imag-1b-F3-prod-01",
+      "switch_port": "1/1/10",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "ixgbe",
+      "enabled": false,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:8c:fa:fd:7c:ae",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.11",
+      "kavlan": false,
+      "mac": "00:8c:fa:fd:7c:b0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse3-3-bmc.grenoble.grid5000.fr"
+    }
+  ],
+  "nodeset": "chartreuse3",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 41600000000,
+    "node_flops": 665600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 20971520,
+    "clock_speed": 2600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Haswell",
+    "microcode": "0x49",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz",
+    "vendor": "Intel",
+    "version": "E5-2640 v3"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e72e577",
+      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+      "firmware_version": "IS06",
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "ST1200MM0007",
+      "size": 1200243695616,
+      "storage": "HDD",
+      "vendor": "Seagate"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "chartreuse3-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..c82fb405864301d7df5855ae2e605bdf82f1e652
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
@@ -0,0 +1,212 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/21/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-03-28",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6320",
+    "serial": "16PFWC2",
+    "warranty_end": "2019-03-28"
+  },
+  "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.12",
+      "kavlan-11": "10.7.247.12",
+      "kavlan-12": "10.11.247.12",
+      "kavlan-13": "10.15.247.12",
+      "kavlan-14": "10.19.247.12",
+      "kavlan-16": "10.27.247.12",
+      "kavlan-17": "10.31.247.12",
+      "kavlan-18": "10.35.247.12",
+      "kavlan-2": "192.168.214.12",
+      "kavlan-20": "10.43.247.12",
+      "kavlan-21": "10.47.247.12",
+      "kavlan-3": "192.168.230.12",
+      "kavlan-4": "10.4.7.12",
+      "kavlan-5": "10.4.71.12",
+      "kavlan-6": "10.4.135.12",
+      "kavlan-7": "10.4.199.12",
+      "kavlan-8": "10.5.7.12",
+      "kavlan-9": "10.5.71.12"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::c",
+      "kavlan-11": "2001:660:4406:1a0:10b::c",
+      "kavlan-12": "2001:660:4406:2a0:10b::c",
+      "kavlan-13": "2001:660:4406:4a0:10b::c",
+      "kavlan-14": "2001:660:4406:5a0:10b::c",
+      "kavlan-16": "2001:660:4406:7a0:10b::c",
+      "kavlan-17": "2001:660:4406:9a0:10b::c",
+      "kavlan-18": "2001:660:4406:8a0:10b::c",
+      "kavlan-2": "2001:660:4406:181:b::c",
+      "kavlan-20": "2001:660:4406:3a0:10b::c",
+      "kavlan-21": "2001:660:4406:6a0:10b::c",
+      "kavlan-3": "2001:660:4406:182:b::c",
+      "kavlan-4": "2001:660:4406:190:b::c",
+      "kavlan-5": "2001:660:4406:191:b::c",
+      "kavlan-6": "2001:660:4406:192:b::c",
+      "kavlan-7": "2001:660:4406:193:b::c",
+      "kavlan-8": "2001:660:4406:194:b::c",
+      "kavlan-9": "2001:660:4406:195:b::c"
+    }
+  },
+  "main_memory": {
+    "ram_size": 68719476736
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "ixgbe",
+      "enabled": true,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "ip": "172.16.26.12",
+      "ip6": "2001:660:4406:100:b::c",
+      "kavlan": true,
+      "mac": "00:8c:fa:fe:9b:06",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "chartreuse3-4.grenoble.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "switch": "imag-1b-F3-prod-01",
+      "switch_port": "1/1/11",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "ixgbe",
+      "enabled": false,
+      "firmware_version": "0x8000095e, 18.5.18",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:8c:fa:fe:9b:08",
+      "management": false,
+      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": true,
+      "sriov_totalvfs": 63,
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.12",
+      "kavlan": false,
+      "mac": "00:8c:fa:fe:9b:0a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse3-4-bmc.grenoble.grid5000.fr"
+    }
+  ],
+  "nodeset": "chartreuse3",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 41600000000,
+    "node_flops": 665600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 20971520,
+    "clock_speed": 2600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Haswell",
+    "microcode": "0x49",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz",
+    "vendor": "Intel",
+    "version": "E5-2640 v3"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e80589b",
+      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+      "firmware_version": "IS06",
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "ST1200MM0007",
+      "size": 1200243695616,
+      "storage": "HDD",
+      "vendor": "Seagate"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "chartreuse3-4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
index 2e0e697d3dd2dd8df19a462cb7b94556fccd4855..e20fdc6efe5041bd41a13bdc0754f0eab6ed79c1 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
@@ -65,12 +65,32 @@
           "uid": "chartreuse2-4"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 10000000000,
+          "snmp_name": "1/1/9",
+          "uid": "chartreuse3-2"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 10000000000,
+          "snmp_name": "1/1/10",
+          "uid": "chartreuse3-3"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 10000000000,
+          "snmp_name": "1/1/11",
+          "uid": "chartreuse3-4"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 10000000000,
+          "snmp_name": "1/1/12",
+          "uid": "chartreuse3-1"
         },
         {
         },
diff --git a/data/grid5000/sites/nantes/pdus/cooling-Z1.json b/data/grid5000/sites/nantes/pdus/cooling-Z1.json
new file mode 100644
index 0000000000000000000000000000000000000000..182882d592a13782cbe333ac14cd49aa845fbb13
--- /dev/null
+++ b/data/grid5000/sites/nantes/pdus/cooling-Z1.json
@@ -0,0 +1,51 @@
+{
+  "ip": "192.168.1.17",
+  "mac": "00:c0:b7:f5:fa:63",
+  "metrics": [
+    {
+      "description": "Temperature in input of cooling system, in tenths of degrees Celsius",
+      "name": "cooling_input_temperature_tenth_celsius",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.7",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Temperature in output of cooling system, in tenths of degrees Celsius",
+      "name": "cooling_output_temperature_tenth_celsius",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.9",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Power consumption of cooling system, in tenths of kilowatt",
+      "name": "cooling_power_watt",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.27.1.6.1.2.1.3.1.2",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
+      "name": "pdu_temperature_tenth_celsius",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.%PORT%",
+        "protocol": "snmp"
+      }
+    }
+  ],
+  "model": "ACRD602",
+  "ports": {
+    "31": "pdu-Z1.20",
+    "33": "pdu-Z1.40",
+    "35": "pdu-Z1.50"
+  },
+  "type": "pdu",
+  "uid": "cooling-Z1",
+  "vendor": "APC"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
index c7c8bf99687f30324949676a037a7f7e351f972b..6b477e278b8f1f5836933954b0889d71274b1e83 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
@@ -12,7 +12,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "10": "ecotype-44",
     "11": "ecotype-45",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
index 8fb267ac089a3880dabfc2789a4711c2b5caee87..a9f7bc493550d0f6aae57f5f9a4b34cdbf29b1eb 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
@@ -12,7 +12,7 @@
       }
     },
     {
-      "description": "Sensor temperature reading in tenths of degrees Celsius",
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
       "name": "pdu_temperature_tenth_celsius",
       "period": 5000,
       "source": {
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "1": "electrical_mgmt_board",
     "10": "ecotype-44",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json
index 74a344bd2913ae2bd626682bee298b9023a8402f..202b8fcd0ae2bc216284dc7b21aa18e8b5833d88 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json
@@ -12,7 +12,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "10": "ecotype-32",
     "11": "ecotype-33",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
index db8d89410e0d87ea4735131fc98f1e0a779e1b7d..a5a367549ce4f0236b7448552de9c6b4f71274f7 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
@@ -12,7 +12,7 @@
       }
     },
     {
-      "description": "Sensor temperature reading in tenths of degrees Celsius",
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
       "name": "pdu_temperature_tenth_celsius",
       "period": 5000,
       "source": {
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "1": "ecotype-prod2",
     "10": "ecotype-32",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json
index 5d2b5128c84a5d147127606d79ae468efc0b744c..f59a05f0b747332d87d8336577fa69a94dde1542 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json
@@ -12,7 +12,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "1": "sw-ecotype-adm",
     "10": "ecotype-20",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
index 790b361efbda57ea40ee31f5e353c30b15eb56db..22e5d9056cca435d90907231e74167ae6fb2cfab 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
@@ -12,7 +12,7 @@
       }
     },
     {
-      "description": "Sensor temperature reading in tenths of degrees Celsius",
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
       "name": "pdu_temperature_tenth_celsius",
       "period": 5000,
       "source": {
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "10": "ecotype-20",
     "11": "ecotype-21",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json
index 6f3f0072c58232498790e13dcd5521186ae6c2fc..eea4d36b8b0d4b450310b71e1ab29f418f4a0e95 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json
@@ -12,7 +12,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "10": "ecotype-8",
     "11": "ecotype-9",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
index ed3c16c2cc2a3cc1ebfab291db9e7373ec97c489..33c0699aa615e258e827ad7c28faa9fa38e2527f 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
@@ -12,7 +12,7 @@
       }
     },
     {
-      "description": "Sensor temperature reading in tenths of degrees Celsius",
+      "description": "Sensor temperature reading, in tenths of degrees Celsius",
       "name": "pdu_temperature_tenth_celsius",
       "period": 5000,
       "source": {
@@ -21,7 +21,7 @@
       }
     }
   ],
-  "model": "AP7940",
+  "model": "AP8453",
   "ports": {
     "1": "ecotype-prod2",
     "10": "ecotype-8",
diff --git a/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json b/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
index d27924d24d59314a7286ccac26f25c45c35a7dfb..ee67a4bf2ef10f0f23ad2020e232212dbee876b6 100644
--- a/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
@@ -7,9 +7,9 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "10/18/2023",
+    "release_date": "02/22/2024",
     "vendor": "Dell Inc.",
-    "version": "2.18.2"
+    "version": "2.19.0"
   },
   "bmc_version": "2.86.86.86",
   "chassis": {
diff --git a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
index d71d423203b3cb964e6279388b5cf2a54f569d35..a71c4fd46a0ddf040ee398643b6478f3bae94c21 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
@@ -80,11 +80,11 @@
   ],
   "model": "Dell PowerEdge T630",
   "nodes_count": 1,
-  "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 4 GPUs GeForce GTX TITAN X, 48GB RAM, 1862GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 4 GPUs GeForce GTX TITAN X, 48GB RAM, 1862GB HDD, 372GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
   "priority": 201706,
   "queues": [
     "admin",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
index 5936ae1353803172434a3caac2d1c326bb176cc9..d09302dd28f2f91f0e93d76fefd56f7af175ed1a 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
@@ -7,11 +7,11 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "10/18/2023",
+    "release_date": "02/22/2024",
     "vendor": "Dell Inc.",
-    "version": "2.18.2"
+    "version": "2.19.0"
   },
-  "bmc_version": "2.85.85.85",
+  "bmc_version": "2.86.86.86",
   "chassis": {
     "manufactured_at": "2016-06-06",
     "manufacturer": "Dell Inc.",
@@ -251,15 +251,26 @@
       "size": 1999307276288,
       "storage": "HDD",
       "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da05411b8001efab8882ea228d5",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SATA",
+      "model": "PERC H730 Adp",
+      "size": 399431958528,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/data/grid5000/sites/sophia/clusters/esterel32/esterel32.json b/data/grid5000/sites/sophia/clusters/esterel32/esterel32.json
new file mode 100644
index 0000000000000000000000000000000000000000..a30d4954ac5ca78fc651fa1407b6bcedd58701e8
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel32/esterel32.json
@@ -0,0 +1,66 @@
+{
+  "boot_type": "bios",
+  "created_at": "Thu, 20 Mar 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "manufactured_at": "2020-08-09",
+  "metrics": [
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge T640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6238R, 28 cores/CPU, 4 GPUs Quadro RTX 8000, 768GB RAM, 446GB HDD, 7151GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 202108,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "esterel32",
+  "warranty_end": "2027-08-10"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.json b/data/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..2e3025d439e06f44c304d4bef8ecc20419393a03
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.json
@@ -0,0 +1,326 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 56,
+    "nb_procs": 2,
+    "nb_threads": 112,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/09/2025",
+    "vendor": "Dell Inc.",
+    "version": "2.23.0"
+  },
+  "bmc_version": "7.00.00.174",
+  "chassis": {
+    "manufactured_at": "2020-08-09",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "5XXGW53",
+    "warranty_end": "2027-08-10"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "7.5",
+      "cores": 4608,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 48318382080,
+      "microarchitecture": "Turing",
+      "model": "Quadro RTX 8000",
+      "performance": {
+        "fp-16": 32620000000000,
+        "fp-32": 16310000000000,
+        "fp-64": 510000000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "90.02.4E.00.03",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "7.5",
+      "cores": 4608,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia1",
+      "memory": 48318382080,
+      "microarchitecture": "Turing",
+      "model": "Quadro RTX 8000",
+      "performance": {
+        "fp-16": 32620000000000,
+        "fp-32": 16310000000000,
+        "fp-64": 510000000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "90.02.4E.00.03",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "7.5",
+      "cores": 4608,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 48318382080,
+      "microarchitecture": "Turing",
+      "model": "Quadro RTX 8000",
+      "performance": {
+        "fp-16": 32620000000000,
+        "fp-32": 16310000000000,
+        "fp-64": 510000000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "90.02.4E.00.03",
+      "vendor": "Nvidia"
+    },
+    "nvidia3": {
+      "compute_capability": "7.5",
+      "cores": 4608,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia3",
+      "memory": 48318382080,
+      "microarchitecture": "Turing",
+      "model": "Quadro RTX 8000",
+      "performance": {
+        "fp-16": 32620000000000,
+        "fp-32": 16310000000000,
+        "fp-64": 510000000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "90.02.4E.00.03",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 824633720832
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 68719476736,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "ip": "172.16.131.45",
+      "ip6": "2001:660:4406:800:4::2d",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:2a:74",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "esterel32-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-2",
+      "switch_port": "1/1/18",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:2a:75",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2np1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth2",
+      "driver": "mlx4_en",
+      "enabled": false,
+      "firmware_version": "2.9.1000",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:02:c9:4f:f9:15",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp137s0d1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.9.1000",
+      "guid": "0x0002c903004ff915",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.45",
+      "kavlan": false,
+      "mac": "00:02:c9:03:00:4f:f9:15",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel32-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.45",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:2a:84",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel32-1-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel32",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 70400000000,
+    "node_flops": 3942400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 40370176,
+    "clock_speed": 2200000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Cascade Lake-SP",
+    "microcode": "0x5003801",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 6238R CPU @ 2.20GHz",
+    "vendor": "Intel",
+    "version": "Gold 6238R"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f0578207002f76eb1f130760be",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "RAID",
+      "model": "PERC H730P Adp",
+      "size": 479559942144,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f05782070027de23a04219a934",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "RAID",
+      "model": "PERC H730P Adp",
+      "size": 7678864654336,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel32-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json b/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json
index 917a999c86e550e2b4697b5a28e49f0ddf45486e..a2ef1cca450fa7e2be9cf52029a935c88ca3a9f0 100644
--- a/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json
@@ -7,9 +7,9 @@
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "10/18/2023",
+    "release_date": "02/22/2024",
     "vendor": "Dell Inc.",
-    "version": "2.18.2"
+    "version": "2.19.0"
   },
   "bmc_version": "2.86.86.86",
   "chassis": {
diff --git a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
index c79c894f8c8eb6b629657c16c2fd117a3df21163..daeaf6de944349ea48e050e87e377323fc846a8e 100644
--- a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
@@ -164,24 +164,22 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_ipoib",
+      "driver": "mlx4_core",
       "enabled": true,
       "firmware_version": "2.40.5000",
       "guid": "0x248a070300ffd1c1",
       "interface": "InfiniBand",
       "ip": "172.18.131.7",
       "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:24:8a:07:03:00:ff:d1:c1",
+      "mac": "24:8a:07:03:00:ff:d1:c1",
       "management": false,
       "model": "MT27500 Family [ConnectX-3]",
       "mountable": true,
       "mounted": true,
-      "name": "ibp130s0",
+      "name": "ib0",
       "netmask": "255.255.240.0",
       "network_address": "esterel6-1-ib0.sophia.grid5000.fr",
       "rate": 40000000000,
-      "sriov": false,
-      "sriov_totalvfs": 0,
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-2.json b/data/grid5000/sites/sophia/network_equipments/sw-2.json
index 1cee59a69d0117f033a9908c9a1e12dcdf0e74c0..463d63f8c537b1b488089361dc2dd32cc4f4523d 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-2.json
@@ -79,6 +79,10 @@
           "uid": "esterel26-1"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/18",
+          "uid": "esterel32-1"
         },
         {
         },
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
index f15945ad4d8fb0fa08d6dc52d5501f8a3b52306a..99360916c89f4a45f9a6efa4e755b8ce01c66f4f 100644
--- a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
@@ -66,6 +66,9 @@
           "uid": "esterel26-1-bmc"
         },
         {
+          "kind": "other",
+          "snmp_name": "1/1/12",
+          "uid": "esterel32-1-bmc"
         },
         {
         },
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
new file mode 100644
index 0000000000000000000000000000000000000000..276e0b6816520bfae9225c81ea5836ae302d467d
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
@@ -0,0 +1,22 @@
+{
+  "boot_type": "uefi",
+  "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+  "exotic": true,
+  "kavlan": false,
+  "manufactured_at": "1970-01-01",
+  "metrics": [
+
+  ],
+  "model": "Switch P4",
+  "nodes_count": 8,
+  "nodes_description": "1 CPU Intel(R) Pentium(R) D1517, 4 cores/CPU, 8GB RAM, 119GB SSD, 1 x 1Gb Ethernet",
+  "priority": 197001,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "engelbourg",
+  "warranty_end": "1970-01-01"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..0758f8d6cc634ae9c3e164f8df0d5f0208ce4d9d
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -0,0 +1,157 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "15.00",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "none",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.1",
+      "ip6": "2001:660:4406:a00:2::1",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:7a",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-1.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet21",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "01:01:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f0"
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "01:02:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f1"
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "01:03:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enx020000000002"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..6c0ac290347a8633484c50a36dd9cf716977b0f3
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -0,0 +1,157 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "15.00",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "none",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.2",
+      "ip6": "2001:660:4406:a00:2::2",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:12",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-2.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-core",
+      "switch_port": "Ethernet44",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "02:01:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f0"
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "02:02:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f1"
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "02:03:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enx020000000002"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..623d2395260de5161461719ab8a2c53983674f8c
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -0,0 +1,157 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "15.00",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "none",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.3",
+      "ip6": "2001:660:4406:a00:2::3",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:39",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-3.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-core",
+      "switch_port": "Ethernet56",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "03:01:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f0"
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "03:02:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f1"
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "03:03:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enx020000000002"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..8499a2cfa3b62909eb07f30a8a6af2af70f8c8c3
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -0,0 +1,157 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "15.00",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "none",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.4",
+      "ip6": "2001:660:4406:a00:2::4",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0e:d7",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-4.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-core",
+      "switch_port": "Ethernet68",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "04:01:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f0"
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "04:02:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f1"
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "04:03:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enx020000000002"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
new file mode 100644
index 0000000000000000000000000000000000000000..8862e761f5816fac3b945f38143ed05677a7f20c
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -0,0 +1,157 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "15.00",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "none",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.5",
+      "ip6": "2001:660:4406:a00:2::5",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:42",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-5.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-core",
+      "switch_port": "Ethernet80",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "05:01:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f0"
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "05:02:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f1"
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "05:03:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enx020000000002"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-5"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..22c07121eaa1fd6260a0d251b89eed477d93671a
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -0,0 +1,157 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "15.00",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "none",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.6",
+      "ip6": "2001:660:4406:a00:2::6",
+      "kavlan": false,
+      "mac": "00:90:fb:76:cd:89",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-6.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-core",
+      "switch_port": "Ethernet92",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "06:01:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f0"
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "06:02:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f1"
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "06:03:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enx020000000002"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-6"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
new file mode 100644
index 0000000000000000000000000000000000000000..3557a8f32a0771d0494d451c3aed938a2deb6437
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -0,0 +1,157 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "15.00",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "none",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.7",
+      "ip6": "2001:660:4406:a00:2::7",
+      "kavlan": false,
+      "mac": "00:90:fb:76:cd:8a",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-7.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-core",
+      "switch_port": "Ethernet104",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "07:01:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f0"
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "07:02:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f1"
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "07:03:00:00:00:00",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enx020000000002"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-7"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
new file mode 100644
index 0000000000000000000000000000000000000000..1acb07ab1c675fc513f9991fe9c568d35852e9c5
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -0,0 +1,157 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "unknown",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "none",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.8",
+      "ip6": "2001:660:4406:a00:2::8",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:38",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-8.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-core",
+      "switch_port": "Ethernet116",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0b:4e",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f0"
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0b:4f",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enp4s0f1"
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "02:00:00:00:00:02",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "name": "enx020000000002"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025032008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-8"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index e54ae28743385b4807b439b2e96f4abd0371895c..ea9457f128e1155892dc8d98104ddce8135099b0 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet6",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet8",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index 57c21d169361c0e456cb8208304d07b4d7ca8dcd..03ff387febdbc55fc582cbf73edb046c5360aeaa 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet33",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet35",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index a432f0e24261d23b9f8c4efde2eee9670908ca99..b718ba2e671e2c0852875cda3934a3447b189c3b 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet9",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet11",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index 63349973ae52124cfe9f9c1a85a91bbe1155f0f0..ddfe08170d65753d6704ca8ba9c50848275f5026 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet12",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet14",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index e323ddf79780a9dac9e44d7211268b3e33ee619d..7106f7b8bc0cd4478b8e3816592bd11067ebcae5 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet15",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet17",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index 7ac10a308793704d1a8b58b55d32c4ff5c8a2e07..bf55890f6273c6314e3fb4fbaf824fd7666a5c7f 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet18",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet20",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index b90e4fac263902bd13aa2a30a51ed7309e87c57e..9fb384e36a2b12fbac0c7de4b67320c888d6b3ae 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet21",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet23",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index 9db29772b705c2142c4635f58751e0def30c5ed6..f6c2cb80161cb2a0289640376319ec87a3c2e53b 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet24",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet26",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index 016220cf643f8b808eb7f86813c4df2d7af97325..495566f21ae89072607a704ac244738eecb0e333 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet27",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet29",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index 10879d0b756b7f8095d31b2ecd2558bf1c39a249..fff418e2bd64eae8e3413e239892f248c47c2f1e 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet30",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet32",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/network_equipments/gw.json b/data/grid5000/sites/strasbourg/network_equipments/gw.json
index 2e8e0b056b26f93de3bce3dbe8882dc5ef0438cd..10ff5e05efffcca7d135c098564ff328066aa556 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/gw.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/gw.json
@@ -2,14 +2,6 @@
   "alias": [
     "gw-strasbourg"
   ],
-  "channels": {
-    "port-channel1": {
-      "kind": "server",
-      "port": "port-channel1",
-      "rate": 50000000000,
-      "uid": "srv-data"
-    }
-  },
   "ip": "172.16.175.254",
   "ip6": "2001:660:4406:a00::ffff:ffff",
   "kind": "router",
@@ -21,177 +13,106 @@
       "kind": "node",
       "ports": [
         {
-          "kind": "channel",
+          "kind": "node",
+          "port": "strasbourg",
           "snmp_name": "Ethernet0",
-          "uid": "port-channel1"
+          "uid": "dev"
         },
         {
-          "kind": "channel",
+          "kind": "node",
+          "port": "apornet",
           "snmp_name": "Ethernet1",
-          "uid": "port-channel1"
-        },
-        {
-          "kind": "server",
-          "snmp_name": "Ethernet2",
-          "uid": "pve-1"
-        },
-        {
-          "kind": "server",
-          "snmp_name": "Ethernet3",
-          "uid": "pve-2"
-        },
-        {
-        },
-        {
+          "uid": "dev"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Ethernet6",
-          "uid": "fleckenstein-1"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet8",
-          "uid": "fleckenstein-1"
+          "snmp_name": "Ethernet2",
+          "uid": "stonet-1"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Ethernet9",
-          "uid": "fleckenstein-2"
-        },
-        {
+          "snmp_name": "Ethernet3",
+          "uid": "ibat-1"
         },
         {
           "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet11",
-          "uid": "fleckenstein-2"
+          "port": "net",
+          "snmp_name": "Ethernet4",
+          "uid": "wiki"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Ethernet12",
-          "uid": "fleckenstein-3"
-        },
-        {
+          "snmp_name": "Ethernet5",
+          "uid": "strasbourg-1"
         },
         {
           "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet14",
-          "uid": "fleckenstein-3"
+          "port": "www",
+          "snmp_name": "Ethernet6",
+          "uid": "dev"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Ethernet15",
-          "uid": "fleckenstein-4"
+          "snmp_name": "Ethernet7",
+          "uid": "soknet-1"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet17",
-          "uid": "fleckenstein-4"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet18",
-          "uid": "fleckenstein-5"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet20",
-          "uid": "fleckenstein-5"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet21",
-          "uid": "fleckenstein-6"
         },
         {
         },
-        {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet23",
-          "uid": "fleckenstein-6"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet24",
-          "uid": "fleckenstein-7"
-        },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet26",
-          "uid": "fleckenstein-7"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet27",
-          "uid": "fleckenstein-8"
         },
         {
         },
         {
           "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet29",
-          "uid": "fleckenstein-8"
+          "port": "RENATER",
+          "snmp_name": "Ethernet19",
+          "uid": "PE"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Ethernet30",
-          "uid": "fleckenstein-9"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet32",
-          "uid": "fleckenstein-9"
+          "snmp_name": "Ethernet20",
+          "uid": "p4-1"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Ethernet33",
-          "uid": "fleckenstein-10"
-        },
-        {
+          "snmp_name": "Ethernet21",
+          "uid": "p4-1"
         },
         {
           "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet35",
-          "uid": "fleckenstein-10"
+          "port": "icube",
+          "snmp_name": "Ethernet22",
+          "uid": "pfsense"
         }
       ],
-      "rate": 25000000000,
+      "rate": 10000000000,
       "snmp_pattern": "Ethernet%PORT%"
     }
   ],
   "managed_by_us": true,
-  "model": "wedge100bf_32x",
-  "serial": "AM26029251",
+  "model": "Juniper EX4600-40F",
   "site": "strasbourg",
   "snmp_community": "Unknown",
   "type": "network_equipment",
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
new file mode 100644
index 0000000000000000000000000000000000000000..2adf8ce2c04c5b4fa45cfbecc3e068294d3576aa
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -0,0 +1,247 @@
+{
+  "ip": "172.16.175.253",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+          "kind": "node",
+          "port": "data",
+          "snmp_name": "Ethernet0",
+          "uid": "srv"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet1",
+          "uid": "pve-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet2",
+          "uid": "pve-2"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet3",
+          "uid": "fleckenstein-1"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet4",
+          "uid": "fleckenstein-2"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet5",
+          "uid": "fleckenstein-3"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet6",
+          "uid": "fleckenstein-4"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet7",
+          "uid": "fleckenstein-5"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet8",
+          "uid": "fleckenstein-6"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet9",
+          "uid": "fleckenstein-7"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet10",
+          "uid": "fleckenstein-8"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet11",
+          "uid": "fleckenstein-9"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet12",
+          "uid": "fleckenstein-10"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet13",
+          "uid": "engelbourg-2"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet14",
+          "uid": "engelbourg-3"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet15",
+          "uid": "engelbourg-4"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet16",
+          "uid": "engelbourg-5"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet17",
+          "uid": "engelbourg-6"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet18",
+          "uid": "engelbourg-7"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet19",
+          "uid": "engelbourg-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet20",
+          "uid": "ramstein-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet21",
+          "uid": "engelbourg-1"
+        },
+        {
+          "kind": "node",
+          "port": "devstrasbourg-bmc",
+          "snmp_name": "Ethernet22",
+          "uid": "iotlab"
+        },
+        {
+          "kind": "node",
+          "port": "devaportnet-bmc",
+          "snmp_name": "Ethernet23",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "stonet-bmc",
+          "snmp_name": "Ethernet24",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "ibat-bmc",
+          "snmp_name": "Ethernet25",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "wikinet-bmc",
+          "snmp_name": "Ethernet26",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "soknet-bmc",
+          "snmp_name": "Ethernet27",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "strasbourg-bmc",
+          "snmp_name": "Ethernet28",
+          "uid": "iotlab"
+        },
+        {
+          "kind": "node",
+          "port": "devwww-bmc",
+          "snmp_name": "Ethernet29",
+          "uid": "iotlab"
+        },
+        {
+          "kind": "node",
+          "port": "www-bmc",
+          "snmp_name": "Ethernet30",
+          "uid": "iotlab"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "Ethernet48",
+          "uid": "sw-core"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "Ethernet%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "unknown",
+  "site": "strasbourg",
+  "snmp_community": "Unknown",
+  "type": "network_equipment",
+  "uid": "sw-admin"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
new file mode 100644
index 0000000000000000000000000000000000000000..f7e9479217caea3a7c6f92a4a3ec775fe938bda9
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -0,0 +1,465 @@
+{
+  "alias": [
+    "engelbourg-1"
+  ],
+  "channels": {
+    "port-channel1": {
+      "kind": "server",
+      "port": "port-channel1",
+      "rate": 50000000000,
+      "uid": "srv-data"
+    }
+  },
+  "ip": "172.16.175.252",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+          "kind": "channel",
+          "snmp_name": "Ethernet0",
+          "uid": "port-channel1"
+        },
+        {
+          "kind": "channel",
+          "snmp_name": "Ethernet1",
+          "uid": "port-channel1"
+        },
+        {
+          "kind": "server",
+          "snmp_name": "Ethernet2",
+          "uid": "pve-1"
+        },
+        {
+          "kind": "server",
+          "snmp_name": "Ethernet3",
+          "uid": "pve-2"
+        },
+        {
+          "kind": "node",
+          "port": "sw1-eth0",
+          "snmp_name": "Ethernet4",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "sw1-eth1",
+          "snmp_name": "Ethernet5",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet6",
+          "uid": "fleckenstein-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet7",
+          "uid": "fleckenstein-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet8",
+          "uid": "fleckenstein-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet9",
+          "uid": "fleckenstein-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet10",
+          "uid": "fleckenstein-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet11",
+          "uid": "fleckenstein-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet12",
+          "uid": "fleckenstein-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet13",
+          "uid": "fleckenstein-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet14",
+          "uid": "fleckenstein-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet15",
+          "uid": "fleckenstein-4"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet16",
+          "uid": "fleckenstein-4"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet17",
+          "uid": "fleckenstein-4"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet18",
+          "uid": "fleckenstein-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet19",
+          "uid": "fleckenstein-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet20",
+          "uid": "fleckenstein-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet21",
+          "uid": "fleckenstein-6"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet22",
+          "uid": "fleckenstein-6"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet23",
+          "uid": "fleckenstein-6"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet24",
+          "uid": "fleckenstein-7"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet25",
+          "uid": "fleckenstein-7"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet26",
+          "uid": "fleckenstein-7"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet27",
+          "uid": "fleckenstein-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet28",
+          "uid": "fleckenstein-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet29",
+          "uid": "fleckenstein-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet30",
+          "uid": "fleckenstein-9"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet31",
+          "uid": "fleckenstein-9"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet32",
+          "uid": "fleckenstein-9"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet33",
+          "uid": "fleckenstein-10"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet34",
+          "uid": "fleckenstein-10"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet35",
+          "uid": "fleckenstein-10"
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "Ethernet36",
+          "uid": "sw-admin"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet40",
+          "uid": "ramstein-1"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet44",
+          "uid": "engelbourg-2"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet56",
+          "uid": "engelbourg-3"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet68",
+          "uid": "engelbourg-4"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet80",
+          "uid": "engelbourg-5"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet92",
+          "uid": "engelbourg-6"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet104",
+          "uid": "engelbourg-7"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet116",
+          "uid": "engelbourg-8"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        }
+      ],
+      "rate": 25000000000,
+      "snmp_pattern": "Ethernet%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "wedge100bf_32x",
+  "site": "strasbourg",
+  "snmp_community": "Unknown",
+  "type": "network_equipment",
+  "uid": "sw-core"
+}
\ No newline at end of file
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index f58ce1300e0dfa91e0fc85c7bcbd20a664d7fdfe..faaa381777c560639050851a90768df2a8ddf609 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -25,6 +25,10 @@ esterel2: &dedicated-epione
     p1: [epione, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
 
+esterel3: &dedicated-graphdeco
+    p1: [graphdeco, '@admin']
+    besteffort: ['@inria_group', '@other_groups_with_access']
+
 esterel5: &dedicated-stars
     p1: [stars, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 1548aa6b2ed9724cea82ca144bc3ac94b8646eee..1eb3f12701d3f4b17385927df6c5c23d6aaf1e01 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -20,6 +20,24 @@ sites:
             chassis:
               manufactured_at: 2016-11-14
               warranty_end: 2021-11-13
+      chartreuse3:
+        nodes:
+          chartreuse3-1:
+            chassis:
+              manufactured_at: 2016-03-28
+              warranty_end: 2019-03-28
+          chartreuse3-2:
+            chassis:
+              manufactured_at: 2016-03-28
+              warranty_end: 2019-03-28
+          chartreuse3-3:
+            chassis:
+              manufactured_at: 2016-03-28
+              warranty_end: 2019-03-28
+          chartreuse3-4:
+            chassis:
+              manufactured_at: 2016-03-28
+              warranty_end: 2019-03-28
       dahu:
         nodes:
           dahu-1:
@@ -2256,6 +2274,12 @@ sites:
             chassis:
               manufactured_at: 2016-06-08
               warranty_end: 2021-06-08
+      esterel32:
+        nodes:
+          esterel32-1:
+            chassis:
+              manufactured_at: 2020-08-09
+              warranty_end: 2027-08-10
       esterel5:
         nodes:
           esterel5-1:
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 79eca3d3a738dbc2905a6d1b0f827a4f8b45bbc3..214d76ee967874a8013d71d0d6135039708cbfcb 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -51,6 +51,7 @@ disk_vendor_model_mapping:
       - ST4000NM0295
       - ST8000NM0185
       - ST2000NM013A
+      - ST1200MM0007
     Toshiba:
       - PX02SSF020
       - PX04SHB020
@@ -147,6 +148,8 @@ disk_vendor_model_mapping:
     Lenovo:
       - SSDSC2KG480GZL
       - ST4000NM000A
+    Innodisk:
+      - M.2 (S80) 3ME4
     Unknown:
       - unknown
     
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index d61dbdd5f2dae5df3ee1d7dce4e2fde1d255f928..ae3ebedd09fa4738b4990ef1bfbd12844639a4f1 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -197,6 +197,7 @@ ipv4:
       sophia esterel30 eth0 0 0 3 36
       sophia esterel31 eth0 0 0 3 40
       sophia esterel32 eth0 0 0 3 44
+      sophia esterel32 ib0 0 0 3 44
       sophia esterel33 eth0 0 0 3 45
       sophia esterel34 eth0 0 0 3 46
       sophia esterel35 eth0 0 0 3 47
@@ -213,6 +214,7 @@ ipv4:
       strasbourg fleckenstein eth0 0 0 0 0
       strasbourg fleckenstein eth1 0 0 0 10
       strasbourg fleckenstein eth2 0 0 0 20
+      strasbourg engelbourg eth0 0 0 1 0
       toulouse montcalm eth0 0 0 8 0
       toulouse estats eth0 0 0 9 0
       louvain spirou eth0 0 0 0 0
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2a998153e86b2319dbe40b64ed6809429fe9fb7c
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
@@ -0,0 +1,41 @@
+---
+model: Dell PowerEdge C6320
+created_at: 2025-03-20
+kavlan: true
+boot_type: bios
+exotic: false 
+queues:
+  - admin
+  - testing
+nodes:
+  chartreuse3-[1-4]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Haswell
+      clock_speed: 2_600_000_000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+    storage_devices:
+      pci-0000:02:00.0-sas-phy0-lun-0:
+        id: disk0
+        interface: SAS
+    software:
+      standard-environment: debian11-x64-std 
+    management_tools:
+      bmc_vendor_tool: racadm 
+    nodeset: chartreuse3
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3_metrics.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3c11d0073c1eaf21ed82b43e7c5efa5407ecd189
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3_metrics.yaml
@@ -0,0 +1,42 @@
+---
+metrics:
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d91b74c95a9966aa58879f0329e777d6512a59cf
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse3-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 16
+    nb_procs: 2
+    nb_threads: 32
+    platform_type: x86_64
+  bios:
+    release_date: 02/21/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6320
+    serial: 16MCWC2
+  main_memory:
+    ram_size: 68719476736
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.26.9
+      mac: 00:8c:fa:fd:6f:ba
+      management: true
+    eth1:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      mac: 00:8c:fa:fd:6f:b8
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: eno2
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+    eth0:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      ip: 172.16.26.9
+      mac: 00:8c:fa:fd:6f:b6
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 20971520
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x49'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz
+    vendor: Intel
+    version: E5-2640 v3
+  storage_devices:
+    pci-0000:02:00.0-sas-phy0-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000c5008e71a54f"
+      by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+      firmware_version: IS06
+      model: ST1200MM0007
+      size: 1200243695616
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..afaba11400d4f2624e9293255ac8e2d68c5510bd
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse3-2:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 16
+    nb_procs: 2
+    nb_threads: 32
+    platform_type: x86_64
+  bios:
+    release_date: 02/21/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6320
+    serial: 16P9WC2
+  main_memory:
+    ram_size: 68719476736
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.26.10
+      mac: 00:8c:fa:fe:97:50
+      management: true
+    eth1:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      mac: 00:8c:fa:fe:97:4e
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: eno2
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+    eth0:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      ip: 172.16.26.10
+      mac: 00:8c:fa:fe:97:4c
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 20971520
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x49'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz
+    vendor: Intel
+    version: E5-2640 v3
+  storage_devices:
+    pci-0000:02:00.0-sas-phy0-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000c5008e7fd4cf"
+      by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+      firmware_version: IS06
+      model: ST1200MM0007
+      size: 1200243695616
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f1b6ecfb0f6972f688a3eb37cf859e99ddb17be0
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse3-3:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 16
+    nb_procs: 2
+    nb_threads: 32
+    platform_type: x86_64
+  bios:
+    release_date: 02/21/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6320
+    serial: 16NGWC2
+  main_memory:
+    ram_size: 68719476736
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.26.11
+      mac: 00:8c:fa:fd:7c:b0
+      management: true
+    eth1:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      mac: 00:8c:fa:fd:7c:ae
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: eno2
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+    eth0:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      ip: 172.16.26.11
+      mac: 00:8c:fa:fd:7c:ac
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 20971520
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x49'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz
+    vendor: Intel
+    version: E5-2640 v3
+  storage_devices:
+    pci-0000:02:00.0-sas-phy0-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000c5008e72e577"
+      by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+      firmware_version: IS06
+      model: ST1200MM0007
+      size: 1200243695616
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a1f3751f86772a908b85328adc39ef229d8de206
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse3-4:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 16
+    nb_procs: 2
+    nb_threads: 32
+    platform_type: x86_64
+  bios:
+    release_date: 02/21/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6320
+    serial: 16PFWC2
+  main_memory:
+    ram_size: 68719476736
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.26.12
+      mac: 00:8c:fa:fe:9b:0a
+      management: true
+    eth1:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      mac: 00:8c:fa:fe:9b:08
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: eno2
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+    eth0:
+      driver: ixgbe
+      firmware_version: 0x8000095e, 18.5.18
+      interface: Ethernet
+      ip: 172.16.26.12
+      mac: 00:8c:fa:fe:9b:06
+      management: false
+      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 63
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 20971520
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x49'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz
+    vendor: Intel
+    version: E5-2640 v3
+  storage_devices:
+    pci-0000:02:00.0-sas-phy0-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000c5008e80589b"
+      by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+      firmware_version: IS06
+      model: ST1200MM0007
+      size: 1200243695616
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
index 71d1e0074e4c5699859c210a8bb1279d98883f23..744e97bbd894e27ff55c68258a520628fbcb354a 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
@@ -35,6 +35,18 @@ imag-1b-F3-prod-01:
         8:
           uid: chartreuse2-4
           rate: 10_000_000_000
+        9:
+          uid: chartreuse3-2
+          rate: 10_000_000_000
+        10:
+          uid: chartreuse3-3
+          rate: 10_000_000_000
+        11:
+          uid: chartreuse3-4
+          rate: 10_000_000_000
+        12:
+          uid: chartreuse3-1
+          rate: 10_000_000_000
         22:
           uid: nessie-1
         39:
diff --git a/input/grid5000/sites/nantes/pdus.yaml b/input/grid5000/sites/nantes/pdus.yaml
index bced731b5827955f1cb6895ec19b60d6c335a5aa..4e653d3da023848d2652b5008c975103278c2b35 100644
--- a/input/grid5000/sites/nantes/pdus.yaml
+++ b/input/grid5000/sites/nantes/pdus.yaml
@@ -2,7 +2,7 @@
 pdus:
   pdu-Z1.10:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -28,7 +28,7 @@ pdus:
 
   pdu-Z1.11:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -37,7 +37,7 @@ pdus:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
       - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading in tenths of degrees Celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
         period: 5000
         source:
           protocol: snmp
@@ -61,7 +61,7 @@ pdus:
 
   pdu-Z1.20:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -87,7 +87,7 @@ pdus:
 
   pdu-Z1.21:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -96,7 +96,7 @@ pdus:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
       - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading in tenths of degrees Celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
         period: 5000
         source:
           protocol: snmp
@@ -119,7 +119,7 @@ pdus:
       14: ecotype-36
   pdu-Z1.40:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -146,7 +146,7 @@ pdus:
 
   pdu-Z1.41:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -155,7 +155,7 @@ pdus:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
       - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading in tenths of degrees Celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
         period: 5000
         source:
           protocol: snmp
@@ -178,7 +178,7 @@ pdus:
 
   pdu-Z1.50:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -204,7 +204,7 @@ pdus:
 
   pdu-Z1.51:
     vendor: APC
-    model: 'AP7940'
+    model: 'AP8453'
     metrics:
       - name: pdu_outlet_power_watt
         description: Power consumption per outlet reported by PDU, in watt
@@ -213,7 +213,7 @@ pdus:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
       - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading in tenths of degrees Celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
         period: 5000
         source:
           protocol: snmp
@@ -234,3 +234,38 @@ pdus:
       12: ecotype-10
       13: ecotype-11
       14: ecotype-12
+
+  cooling-Z1:
+    vendor: APC
+    model: 'ACRD602'
+    metrics:
+      - name: cooling_input_temperature_tenth_celsius
+        description: Temperature in input of cooling system, in tenths of degrees Celsius
+        period: 5000
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.7
+      - name: cooling_output_temperature_tenth_celsius
+        description: Temperature in output of cooling system, in tenths of degrees Celsius
+        period: 5000
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.9
+      - name: cooling_power_watt
+        description: Power consumption of cooling system, in tenths of kilowatt
+        period: 5000
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.27.1.6.1.2.1.3.1.2
+      - name: pdu_temperature_tenth_celsius
+        description: Sensor temperature reading, in tenths of degrees Celsius
+        period: 5000
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.%PORT%
+    ip: 192.168.1.17
+    mac: 00:c0:b7:f5:fa:63
+    ports:
+      31: pdu-Z1.20
+      33: pdu-Z1.40
+      35: pdu-Z1.50
diff --git a/input/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.yaml b/input/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.yaml
index 6ffc8c2e5b863612a407d9a5323c6c83af4a1350..9abf73995f92136d9a346c163fe832921e5c2aab 100644
--- a/input/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.yaml
@@ -8,9 +8,9 @@ esterel2-1:
     nb_threads: 24
     platform_type: x86_64
   bios:
-    release_date: 10/18/2023
+    release_date: 02/22/2024
     vendor: Dell Inc.
-    version: 2.18.2
+    version: 2.19.0
   bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
index 90a02fbb166029bd68cc9f7d826d21cb2955b07d..931d73ea6c29a7e5d93d7f3639f2f45867f67651 100644
--- a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
@@ -6,13 +6,13 @@ boot_type: bios
 exotic: false
 queues:
   - admin
-  - testing
+  - production
 nodes:
   esterel3-1:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
+      max_walltime: 604800
     processor:
       microarchitecture: Broadwell
       clock_speed: 2_200_000_000
@@ -34,6 +34,9 @@ nodes:
       pci-0000:03:00.0-scsi-0:2:0:0:
         id: disk0
         interface: SAS
+      pci-0000:03:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: SATA
     software:
       standard-environment: debian11-x64-std
     management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
index 9ead050b211493a92c02503c09c5f7eed4eff64c..dc292d7ef07f5765ecccd5c285ef4237bcbf3aa0 100644
--- a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
@@ -8,10 +8,10 @@ esterel3-1:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 10/18/2023
+    release_date: 02/22/2024
     vendor: Dell Inc.
-    version: 2.18.2
-  bmc_version: 2.85.85.85
+    version: 2.19.0
+  bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge T630
@@ -138,5 +138,12 @@ esterel3-1:
       model: PERC H730 Adp
       size: 1999307276288
       storage: HDD
+    pci-0000:03:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da05411b8001efab8882ea228d5"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 399431958528
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/esterel32/esterel32.yaml b/input/grid5000/sites/sophia/clusters/esterel32/esterel32.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7a8f378e8370da43d53bafd8e75a8517fa1f0d96
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel32/esterel32.yaml
@@ -0,0 +1,53 @@
+---
+model: Dell PowerEdge T640
+created_at: 2025-03-20
+kavlan: false
+boot_type: bios
+exotic: false 
+queues:
+  - admin
+  - testing
+nodes:
+  esterel32-1:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Cascade Lake-SP
+      clock_speed: 2200000000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+      eth2:
+        enabled: false
+        mountable: false
+        mounted: false
+      ib0:
+        mounted: true
+        enabled: true
+        mountable: true
+        netmask: 255.255.240.0
+    storage_devices:
+      pci-0000:19:00.0-scsi-0:2:0:0:
+        id: disk0
+        interface: RAID
+      pci-0000:19:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: RAID
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: esterel32
diff --git a/input/grid5000/sites/sophia/clusters/esterel32/esterel32_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel32/esterel32_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..729e9beb582834908e55a7537bd5ace8abbd1f3d
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel32/esterel32_metrics.yaml
@@ -0,0 +1,40 @@
+---
+metrics:
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
diff --git a/input/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.yaml b/input/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b40c53d7f8d01ce88041ccfd9edc3b8bbf1a1f77
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.yaml
@@ -0,0 +1,180 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel32-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 56
+    nb_procs: 2
+    nb_threads: 112
+    platform_type: x86_64
+  bios:
+    release_date: 01/09/2025
+    vendor: Dell Inc.
+    version: 2.23.0
+  bmc_version: 7.00.00.174
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T640
+    serial: 5XXGW53
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 48318382080
+      model: Quadro RTX 8000
+      power_default_limit: 250.00 W
+      vbios_version: 90.02.4E.00.03
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 0
+      device: "/dev/nvidia1"
+      memory: 48318382080
+      model: Quadro RTX 8000
+      power_default_limit: 250.00 W
+      vbios_version: 90.02.4E.00.03
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 48318382080
+      model: Quadro RTX 8000
+      power_default_limit: 250.00 W
+      vbios_version: 90.02.4E.00.03
+      vendor: Nvidia
+    nvidia3:
+      cpu_affinity: 1
+      device: "/dev/nvidia3"
+      memory: 48318382080
+      model: Quadro RTX 8000
+      power_default_limit: 250.00 W
+      vbios_version: 90.02.4E.00.03
+      vendor: Nvidia
+  main_memory:
+    ram_size: 824633720832
+  memory_devices:
+    dimm_a1:
+      size: 68719476736
+      technology: dram
+    dimm_a2:
+      size: 68719476736
+      technology: dram
+    dimm_a3:
+      size: 68719476736
+      technology: dram
+    dimm_a4:
+      size: 68719476736
+      technology: dram
+    dimm_a5:
+      size: 68719476736
+      technology: dram
+    dimm_a6:
+      size: 68719476736
+      technology: dram
+    dimm_b1:
+      size: 68719476736
+      technology: dram
+    dimm_b2:
+      size: 68719476736
+      technology: dram
+    dimm_b3:
+      size: 68719476736
+      technology: dram
+    dimm_b4:
+      size: 68719476736
+      technology: dram
+    dimm_b5:
+      size: 68719476736
+      technology: dram
+    dimm_b6:
+      size: 68719476736
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.45
+      mac: f4:02:70:ed:2a:84
+      management: true
+    eth0:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      ip: 172.16.131.45
+      mac: f4:02:70:ed:2a:74
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth1:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      mac: f4:02:70:ed:2a:75
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: eno2np1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth2:
+      driver: mlx4_en
+      firmware_version: 2.9.1000
+      interface: Ethernet
+      mac: 00:02:c9:4f:f9:15
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      name: enp137s0d1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Mellanox Technologies
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.9.1000
+      guid: '0x0002c903004ff915'
+      interface: InfiniBand
+      ip: 172.18.131.45
+      mac: 00:02:c9:03:00:4f:f9:15
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 40370176
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x5003801'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Gold 6238R CPU @ 2.20GHz
+    vendor: Intel
+    version: Gold 6238R
+  storage_devices:
+    pci-0000:19:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f0578207002f76eb1f130760be"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 479559942144
+      storage: HDD
+    pci-0000:19:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f05782070027de23a04219a934"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 7678864654336
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.yaml b/input/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.yaml
index a4fc5ae146d8cb2d257fc549f0c93464832aa1d4..091a944e35bb87fcb742e4673fb9cf10a0ef30f5 100644
--- a/input/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.yaml
@@ -8,9 +8,9 @@ esterel4-1:
     nb_threads: 40
     platform_type: x86_64
   bios:
-    release_date: 10/18/2023
+    release_date: 02/22/2024
     vendor: Dell Inc.
-    version: 2.18.2
+    version: 2.19.0
   bmc_version: 2.86.86.86
   chassis:
     manufacturer: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml b/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
index cebecacb0b818653ceb4d96d903e940596603750..0c30192c0a5b440253ae2f156a9abcbe05cf7841 100644
--- a/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
@@ -94,17 +94,16 @@ esterel6-1:
       sriov_totalvfs: 0
       vendor: Intel
     ib0:
-      driver: ib_ipoib
+      driver: mlx4_core
       firmware_version: 2.40.5000
       guid: '0x248a070300ffd1c1'
       interface: InfiniBand
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:24:8a:07:03:00:ff:d1:c1
+      ip: 172.18.131.7
+      mac: 24:8a:07:03:00:ff:d1:c1
       management: false
       model: MT27500 Family [ConnectX-3]
-      name: ibp130s0
+      name: ib0
       rate: 40000000000
-      sriov: false
-      sriov_totalvfs: 0
       vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
diff --git a/input/grid5000/sites/sophia/networks/sw-2.yaml b/input/grid5000/sites/sophia/networks/sw-2.yaml
index ca5d943dae4448fcbfccb5145472900570c39013..baf2898fccc247a9ef633e06a7d0d15252c12579 100644
--- a/input/grid5000/sites/sophia/networks/sw-2.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-2.yaml
@@ -46,6 +46,8 @@ sw-2:
           kind: other
         17:
           uid: esterel26-1
+        18:
+          uid: esterel32-1
         33:
           uid: esterel10-2
           port: eth1
diff --git a/input/grid5000/sites/sophia/networks/swadmin-2.yaml b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
index e6b52ec445320d8e3a7d233ecbc6504bb1f001fc..5bc037306742e5fa2f952a8767b350b309a8a956 100644
--- a/input/grid5000/sites/sophia/networks/swadmin-2.yaml
+++ b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
@@ -47,6 +47,9 @@ swadmin-2:
         11:
           uid: esterel26-1-bmc
           kind: other
+        12:
+          uid: esterel32-1-bmc
+          kind: other
         25:
           uid: sw-2
           kind: switch
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..03f52cdfeab2a8785c8fd2d354a2b42e401c2eec
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
@@ -0,0 +1,38 @@
+---
+model: Switch P4
+created_at: 1970-01-01 # TODO: change this value
+kavlan: false
+boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice)
+exotic: true 
+queues:
+  - admin
+  - testing
+nodes:
+  engelbourg-[1-8]:
+    chassis:
+      manufactured_at: 1970-01-01 # TODO: Put date.
+      warranty_end: 1970-01-01 # TODO: Put date.
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Broadwell
+      clock_speed: 1600000000
+      model: Intel(R) Pentium(R)
+      version: D1517
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+    storage_devices:
+      pci-0000:00:1f.2-ata-1:
+        id: disk0
+        interface: SATA
+    software:
+      standard-environment: debian11-x64-std # TODO: check that architecture is OK
+    management_tools:
+      bmc_vendor_tool: "none"
+    nodeset: engelbourg # TODO: rename cluster
+
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..76a3f10fac23384e7a1e6e6ac6174b76decb5de5
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
@@ -0,0 +1,89 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-1:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: '15.00'
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.1
+      mac: 00:90:fb:78:0f:7a
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      interface: Ethernet
+      mac: 01:01:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f0
+      enabled: false
+      mountable: false
+      mounted: false
+    eth2:
+      interface: Ethernet
+      mac: 01:02:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f1
+      enabled: false
+      mountable: false
+      mounted: false
+    eth3:
+      interface: Ethernet
+      mac: 01:03:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enx020000000002
+      enabled: false
+      mountable: false
+      mounted: false
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..de532f9305dadfebb067a5502c0f26e6f04345af
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
@@ -0,0 +1,89 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-2:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: '15.00'
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.2
+      mac: 00:90:fb:78:0F:12
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      interface: Ethernet
+      mac: 02:01:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f0
+      enabled: false
+      mountable: false
+      mounted: false
+    eth2:
+      interface: Ethernet
+      mac: 02:02:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f1
+      enabled: false
+      mountable: false
+      mounted: false
+    eth3:
+      interface: Ethernet
+      mac: 02:03:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enx020000000002
+      enabled: false
+      mountable: false
+      mounted: false
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2deb2e7710c54cd854157f90d16db72b7b46f5ee
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
@@ -0,0 +1,89 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-3:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: '15.00'
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.3
+      mac: 00:90:fb:78:0F:39
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      interface: Ethernet
+      mac: 03:01:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f0
+      enabled: false
+      mountable: false
+      mounted: false
+    eth2:
+      interface: Ethernet
+      mac: 03:02:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f1
+      enabled: false
+      mountable: false
+      mounted: false
+    eth3:
+      interface: Ethernet
+      mac: 03:03:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enx020000000002
+      enabled: false
+      mountable: false
+      mounted: false
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..be11407f5ad382dacc9d5e09e139b2423ff01d0f
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
@@ -0,0 +1,89 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-4:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: '15.00'
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.4
+      mac: 00:90:fb:78:0E:D7
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      interface: Ethernet
+      mac: 04:01:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f0
+      enabled: false
+      mountable: false
+      mounted: false
+    eth2:
+      interface: Ethernet
+      mac: 04:02:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f1
+      enabled: false
+      mountable: false
+      mounted: false
+    eth3:
+      interface: Ethernet
+      mac: 04:03:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enx020000000002
+      enabled: false
+      mountable: false
+      mounted: false
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ba53501825464fc2bc366ecf892b98bc53036e0c
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
@@ -0,0 +1,89 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-5:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: '15.00'
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.5
+      mac: 00:90:FB:78:0F:42
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      interface: Ethernet
+      mac: 05:01:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f0
+      enabled: false
+      mountable: false
+      mounted: false
+    eth2:
+      interface: Ethernet
+      mac: 05:02:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f1
+      enabled: false
+      mountable: false
+      mounted: false
+    eth3:
+      interface: Ethernet
+      mac: 05:03:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enx020000000002
+      enabled: false
+      mountable: false
+      mounted: false
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fc207d6b86bbf19c5bad257f1392f5774c494c85
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
@@ -0,0 +1,89 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-6:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: '15.00'
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.6
+      mac: 00:90:fb:76:cd:89
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      interface: Ethernet
+      mac: 06:01:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f0
+      enabled: false
+      mountable: false
+      mounted: false
+    eth2:
+      interface: Ethernet
+      mac: 06:02:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f1
+      enabled: false
+      mountable: false
+      mounted: false
+    eth3:
+      interface: Ethernet
+      mac: 06:03:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enx020000000002
+      enabled: false
+      mountable: false
+      mounted: false
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..215a96652cbad1ff988df4363ad8101be5489766
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
@@ -0,0 +1,89 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-7:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: '15.00'
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.7
+      mac: 00:90:fb:76:cd:8a
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      interface: Ethernet
+      mac: 07:01:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f0
+      enabled: false
+      mountable: false
+      mounted: false
+    eth2:
+      interface: Ethernet
+      mac: 07:02:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enp4s0f1
+      enabled: false
+      mountable: false
+      mounted: false
+    eth3:
+      interface: Ethernet
+      mac: 07:03:00:00:00:00 #FAKE VALUE
+      management: false
+      name: enx020000000002
+      enabled: false
+      mountable: false
+      mounted: false
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ec22dff2220edd5c0bb4ec3784f2f634f873fa88
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
@@ -0,0 +1,89 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-8:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: unknown
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.8
+      mac: 00:90:fb:78:0f:38
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      interface: Ethernet
+      mac: 00:90:fb:78:0b:4e
+      management: false
+      name: enp4s0f0
+      enabled: false
+      mountable: false
+      mounted: false
+    eth2:
+      interface: Ethernet
+      mac: 00:90:fb:78:0b:4f
+      management: false
+      name: enp4s0f1
+      enabled: false
+      mountable: false
+      mounted: false
+    eth3:
+      interface: Ethernet
+      mac: 02:00:00:00:00:02
+      management: false
+      name: enx020000000002
+      enabled: false
+      mountable: false
+      mounted: false
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
index 4eb4fdf1864c3e28303974a226b748aa3e201fa3..562efcef2114d119581a6dd7c099c5de20e622d2 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
@@ -1,7 +1,6 @@
 ---
 gw:
-  model: wedge100bf_32x
-  serial: AM26029251
+  model: Juniper EX4600-40F
   ip: 172.16.175.254
   ip6: 2001:660:4406:a00::ffff:ffff
   kind: router
@@ -63,56 +62,20 @@ gw:
         - 10.39.192.0/18
   linecards:
     1:
-      rate: 25000000000
+      rate: 10000000000
       snmp_pattern: "Ethernet%PORT%"
       kavlan_pattern: "%PORT%"
       kind: node
       ports:
-        0:
-          uid: port-channel1
-          kind: channel
-        1:
-          uid: port-channel1
-          kind: channel
-        2:
-          uid: pve-1
-          kind: server
-        3:
-          uid: pve-2
-          kind: server
-        6: fleckenstein-1-eth0
-        7:
-        8: fleckenstein-1-eth2
-        9: fleckenstein-2-eth0
-        10:
-        11: fleckenstein-2-eth2
-        12: fleckenstein-3-eth0
-        13:
-        14: fleckenstein-3-eth2
-        15: fleckenstein-4-eth0
-        16:
-        17: fleckenstein-4-eth2
-        18: fleckenstein-5-eth0
-        19:
-        20: fleckenstein-5-eth2
-        21: fleckenstein-6-eth0
-        22:
-        23: fleckenstein-6-eth2
-        24: fleckenstein-7-eth0
-        25:
-        26: fleckenstein-7-eth2
-        27: fleckenstein-8-eth0
-        28:
-        29: fleckenstein-8-eth2
-        30: fleckenstein-9-eth0
-        31:
-        32: fleckenstein-9-eth2
-        33: fleckenstein-10-eth0
-        34:
-        35: fleckenstein-10-eth2
-  channels:
-    port-channel1:
-      port: port-channel1
-      uid: srv-data
-      rate: 50000000000
-      kind: server
+        0: dev-strasbourg
+        1: dev-apornet
+        2: stonet-1
+        3: ibat-1
+        4: wiki-net
+        5: strasbourg-1
+        6: dev-www
+        7: soknet-1
+        19: PE-RENATER
+        20: p4-1
+        21: p4-1
+        22: pfsense-icube
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7164b511f918878574d3b8502a14c8ebfb2fa958
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -0,0 +1,49 @@
+---
+sw-admin:
+  model: unknown
+  ip: 172.16.175.253
+  kind: switch
+  managed_by_us: true
+  snmp_community: Unknown
+  site: strasbourg
+  linecards:
+    1:
+      rate: 1000000000
+      snmp_pattern: "Ethernet%PORT%"
+      kavlan_pattern: "%PORT%"
+      kind: node
+      ports:
+        0: srv-data
+        1: pve-1
+        2: pve-2
+        3: fleckenstein-1-bmc 
+        4: fleckenstein-2-bmc
+        5: fleckenstein-3-bmc
+        6: fleckenstein-4-bmc
+        7: fleckenstein-5-bmc
+        8: fleckenstein-6-bmc
+        9: fleckenstein-7-bmc 
+        10: fleckenstein-8-bmc 
+        11: fleckenstein-9-bmc 
+        12: fleckenstein-10-bmc 
+        13: engelbourg-2-bmc
+        14: engelbourg-3-bmc 
+        15: engelbourg-4-bmc 
+        16: engelbourg-5-bmc 
+        17: engelbourg-6-bmc 
+        18: engelbourg-7-bmc 
+        19: engelbourg-8-bmc 
+        20: ramstein-1
+        21: engelbourg-1
+        22: iotlab-devstrasbourg-bmc
+        23: inetlab-devaportnet-bmc
+        24: inetlab-stonet-bmc
+        25: inetlab-ibat-bmc
+        26: inetlab-wikinet-bmc
+        27: inetlab-soknet-bmc
+        28: iotlab-strasbourg-bmc
+        29: iotlab-devwww-bmc
+        30: iotlab-www-bmc
+        48: 
+          uid: sw-core
+          kind: switch
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..82e22b7af235948cf565e90930ce44babad72268
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -0,0 +1,109 @@
+---
+sw-core:
+  model: wedge100bf_32x
+  ip: 172.16.175.252
+  #TODO
+  #ip6: 2001:660:4406:a00::ffff:ffff
+  kind: switch
+  managed_by_us: true
+  snmp_community: Unknown
+  alias:
+    - engelbourg-1
+  site: strasbourg
+  linecards: 
+    1:
+      rate: 25000000000
+      snmp_pattern: "Ethernet%PORT%"
+      kavlan_pattern: "%PORT%"
+      kind: node
+      ports:
+        0:
+          uid: port-channel1
+          kind: channel
+        1:
+          uid: port-channel1
+          kind: channel 
+        2:
+          uid: pve-1
+          kind: server
+        3:
+          uid: pve-2
+          kind: server
+        4: inetlab-sw1-eth0
+        5: inetlab-sw1-eth1
+        6: fleckenstein-1-eth0
+        7: fleckenstein-1-eth1
+        8: fleckenstein-1-eth2
+        9: fleckenstein-2-eth0
+        10: fleckenstein-2-eth1
+        11: fleckenstein-2-eth2
+        12: fleckenstein-3-eth0
+        13: fleckenstein-3-eth1
+        14: fleckenstein-3-eth2
+        15: fleckenstein-4-eth0
+        16: fleckenstein-4-eth1
+        17: fleckenstein-4-eth2
+        18: fleckenstein-5-eth0
+        19: fleckenstein-5-eth1
+        20: fleckenstein-5-eth2
+        21: fleckenstein-6-eth0
+        22: fleckenstein-6-eth1
+        23: fleckenstein-6-eth2
+        24: fleckenstein-7-eth0
+        25: fleckenstein-7-eth1
+        26: fleckenstein-7-eth2
+        27: fleckenstein-8-eth0
+        28: fleckenstein-8-eth1
+        29: fleckenstein-8-eth2
+        30: fleckenstein-9-eth0
+        31: fleckenstein-9-eth1
+        32: fleckenstein-9-eth2
+        33: fleckenstein-10-eth0
+        34: fleckenstein-10-eth1
+        35: fleckenstein-10-eth2
+        36: 
+          uid: sw-admin
+          kind: switch
+        40: ramstein-1
+        44: 
+          uid: engelbourg-2-eth0
+          rate: 1000000000
+        48: 
+        52: 
+        56: 
+          uid: engelbourg-3-eth0
+          rate: 1000000000
+        60: 
+        64: 
+        68: 
+          uid: engelbourg-4-eth0
+          rate: 1000000000
+        72: 
+        76: 
+        80: 
+          uid: engelbourg-5-eth0
+          rate: 1000000000
+        84: 
+        88:
+        92: 
+          uid: engelbourg-6-eth0
+          rate: 1000000000
+        96: 
+        100: 
+        104: 
+          uid: engelbourg-7-eth0
+          rate: 1000000000
+        108: 
+        112: 
+        116:
+          uid: engelbourg-8-eth0
+          rate: 1000000000
+        120: 
+        124: 
+  channels:
+    port-channel1:
+      port: port-channel1
+      uid: srv-data
+      rate: 50000000000
+      kind: server
+
diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index 12ec69699e921ee65f101f0b82f064089efa867e..1666cc84e54568452aa387030f3ddbf040f3628d 100644
--- a/lib/refrepo/gen/wiki/generators/site_hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb
@@ -62,7 +62,7 @@ class SiteHardwareGenerator < WikiGenerator
     output = ''
     [
       [ '== Default queue resources ==', /(^$|exotic)/ ],
-      [ '== Production queue resources ==', /production/],
+      [ '== Abaca queue resources ==', /production/],
       [ '== Testing queue resources ==', /testing/]
     ].each do |title,regexp|
       if table_data.select{ |row| row[column] =~ regexp}.length > 0
@@ -115,7 +115,7 @@ class SiteHardwareGenerator < WikiGenerator
       summary += MW::TABLE_CELL + ' width="50%" valign="top" ' + MW::TABLE_CELL + MW::LINE_FEED
       ## 2st inner table
       summary += MW::TABLE_START + ' width="100%"' + MW::LINE_FEED
-      summary += print_header_summary('=== Production queue resources ===', 'production', store)
+      summary += print_header_summary('=== Abaca queue resources ===', 'production', store)
       summary += MW::TABLE_END + MW::LINE_FEED
 
       ## End outer-tablie
@@ -194,7 +194,7 @@ class SiteHardwareGenerator < WikiGenerator
       queue = cluster_hash.map { |_k, v| v['queue']}.first
       access_conditions = []
       if queue == 'production'
-        access_conditions << "<b>[[Grid5000:UsagePolicy#Rules_for_the_production_queue|#{queue}]]</b>&nbsp;queue"
+        access_conditions << "<b>[[Grid5000:UsagePolicy#Rules_for_the_production_queue|abaca]]</b>&nbsp;queue"
       elsif queue != ''
         access_conditions << "<b>#{queue}</b>&nbsp;queue"
       end
@@ -249,9 +249,9 @@ class SiteHardwareGenerator < WikiGenerator
       queue = (queue.nil? || queue.empty?) ? 'default' : queue
       queue_drawgantt_url = get_queue_drawgantt_url(site, queue)
       if (queue != 'testing')
-        text_data << "\n= Clusters in the [#{queue_drawgantt_url} #{queue} queue] ="
+        text_data << "\n= Clusters in the [#{queue_drawgantt_url} #{queue == 'production' ? 'abaca' : queue} queue] ="
       else
-        text_data << "\n= Clusters in the #{queue} queue ="
+        text_data << "\n= Clusters in the #{queue == 'production' ? 'abaca' : queue} queue ="
       end
       clusters.sort_by{|cluster_uid, _cluster_hash| split_cluster_node(cluster_uid) }.to_h.each { |cluster_uid, cluster_hash|
         subclusters = cluster_hash.keys.count != 1
@@ -269,7 +269,7 @@ class SiteHardwareGenerator < WikiGenerator
 
         reservation_cmd = "\n{{Term|location=f#{site}|cmd="
         reservation_cmd += "<code class=\"command\">oarsub</code> "
-        reservation_cmd += "<code class=\"replace\">-q #{queue}</code> " if queue != 'default'
+        reservation_cmd += "<code class=\"replace\">-q #{queue == 'production' ? 'abaca' : queue}</code> "
         reservation_cmd += "<code class=\"replace\">-t exotic</code> " if cluster_hash.map { |_k, v| v['exotic']}.first
         reservation_cmd += "<code class=\"env\">-p #{cluster_uid}</code> "
         reservation_cmd += "<code>-I</code>"
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index df08b5111e207255dd39a975c4393ad3026c6e80..00e5e9149a39f4e6e8c8ad47cf9f1187a45b905f 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -744,7 +744,7 @@ def get_flops_per_cycle(microarch, cpu_name, cluster_uid)
     case cpu_name
     when /Silver 4110/, /Silver 4114/, /Silver 4214/, /Silver 4216/, /Gold 5218/, /Gold 5220/, /Gold 5115/, /Gold 5118/, /Gold 5120/, /Gold 5220R/
       return 16
-    when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/
+    when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/, /Gold 6238R/
       return 32
     end
     raise "Error: unknown CPU flop per cycle for #{cpu_name} (cluster #{cluster_uid}), cannot compute flops"
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 130141926d5d1302a0011bd1aae3d19ac72f46cf..526c6e905924527ae720b58abf8793cc1b0cf8a9 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -120,6 +120,9 @@ drac:
 chartreuse2:
   enp129s0f0: eth0
   enp129s0f1: eth1
+chartreuse3:
+  enp129s0f0: eth0
+  enp129s0f1: eth1
 econome:
   eno1: eth2
   eno2: eth3
@@ -130,6 +133,11 @@ ecotype:
   eno2: eth1
   eno3: eth2
   eno4: eth3
+engelbourg:
+  enp2s0: eth0
+  enp4s0f0: eth1
+  enp4s0f1: eth2
+  enx020000000002: eth3
 fleckenstein:
   ens10f0: eth0
   ens10f1: eth1
@@ -437,6 +445,12 @@ esterel27:
   enp129s0f1: eth1
   enp1s0f0np0: eth0
   ibp28s0: ib0
+esterel32:
+  enp1s0f0np0: eth0
+  eno1np0: eth0
+  eno2np1: eth1
+  enp137s0d1: eth2
+  ibp137s0: ib0
 esterel41:
   enp1s0f0np0: eth0
   ens15f1: eth1