diff --git a/data/grid5000/sites/sophia/clusters/esterel7/esterel7.json b/data/grid5000/sites/sophia/clusters/esterel7/esterel7.json
new file mode 100644
index 0000000000000000000000000000000000000000..54de50d825baefd7303233505c77684249f8ff48
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel7/esterel7.json
@@ -0,0 +1,93 @@
+{
+  "boot_type": "bios",
+  "created_at": "Thu, 06 Mar 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "manufactured_at": "2017-05-23",
+  "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"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "DCGM_FI_DEV_SM_CLOCK",
+          "DCGM_FI_DEV_MEM_CLOCK",
+          "DCGM_FI_DEV_GPU_TEMP",
+          "DCGM_FI_DEV_POWER_USAGE",
+          "DCGM_FI_DEV_MEM_COPY_UTIL"
+        ],
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge T630",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs Intel Xeon E5-2620 v4, 8 cores/CPU, 4 GPUs GeForce GTX 1080 Ti, 128GB RAM, 1862GB HDD, 372GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 201805,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "esterel7",
+  "warranty_end": "2022-05-23"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.json b/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..2f17b3ae0eb23d9086c368ad5ad073c68e5a7659
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.json
@@ -0,0 +1,329 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/22/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2017-05-23",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T630",
+    "serial": "BB6T5K2",
+    "warranty_end": "2022-05-23"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia1",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia3": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia3",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 137438953472
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a7",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a8",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b7",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b8",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "ip": "172.16.131.8",
+      "ip6": "2001:660:4406:800:4::8",
+      "kavlan": false,
+      "mac": "18:66:da:a2:51:11",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "esterel7-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-6",
+      "switch_port": "1/1/17",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": false,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "18:66:da:a2:51:12",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.36.5000",
+      "guid": "0x248a070300fb51d1",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.8",
+      "kavlan": false,
+      "mac": "24:8a:07:03:00:fb:51:d1",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel7-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.8",
+      "kavlan": false,
+      "mac": "18:66:da:a2:51:13",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel7-1-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel7",
+  "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": 33600000000,
+    "node_flops": 537600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 20971520,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "E5-2620 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da0b1c1480020e91fdbfc86d4a1",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "RAID",
+      "model": "PERC H730 Adp",
+      "size": 1999307276288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da0b1c1480020e920b809a7ae57",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "RAID",
+      "model": "PERC H730 Adp",
+      "size": 399431958528,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel7-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.json b/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..5438ac6b42cc1680ff7c3986e77b72a91c03753a
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.json
@@ -0,0 +1,329 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/22/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2017-05-23",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T630",
+    "serial": "BB6Q5K2",
+    "warranty_end": "2022-05-23"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia1",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    },
+    "nvidia3": {
+      "compute_capability": "6.1",
+      "cores": 3584,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia3",
+      "memory": 11811160064,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080 Ti",
+      "performance": {
+        "fp-16": 177200000000,
+        "fp-32": 11340000000000,
+        "fp-64": 354400000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "86.02.39.00.01",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 137438953472
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a7",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a8",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b7",
+      "size": 8589934592,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b8",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "ip": "172.16.131.9",
+      "ip6": "2001:660:4406:800:4::9",
+      "kavlan": false,
+      "mac": "18:66:da:a2:43:cc",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "esterel7-2.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-6",
+      "switch_port": "1/1/18",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": false,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "18:66:da:a2:43:cd",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.36.5000",
+      "guid": "0x248a070300fb5091",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.9",
+      "kavlan": false,
+      "mac": "24:8a:07:03:00:fb:50:91",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel7-2-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.9",
+      "kavlan": false,
+      "mac": "18:66:da:a2:43:ce",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel7-2-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel7",
+  "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": 33600000000,
+    "node_flops": 537600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 20971520,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "E5-2620 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da0b1c1d40020e91f8d0887f027",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "RAID",
+      "model": "PERC H730 Adp",
+      "size": 1999307276288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da0b1c1d40020e9202d121ae4dc",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "RAID",
+      "model": "PERC H730 Adp",
+      "size": 399431958528,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel7-2"
+}
\ No newline at end of file
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 8ce522b90bc6ed76035fb061cf0b672daaf85d72..a658baf9c649a2b92ccbf74fbc17fa32cbf2521d 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2228,6 +2228,16 @@ sites:
             chassis:
               manufactured_at: 2017-03-30
               warranty_end: 2022-03-30
+      esterel7:
+        nodes:
+          esterel7-1:
+            chassis:
+              manufactured_at: 2017-05-23
+              warranty_end: 2022-05-23
+          esterel7-2:
+            chassis:
+              manufactured_at: 2017-05-23
+              warranty_end: 2022-05-23
       mercantour2:
         nodes:
           mercantour2-1:
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index eb5a9944d438a5d8455b1c66c042fcae4aeb63d8..11bac905e7d0a505e246e2485ea65a8806e62e5c 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -133,6 +133,7 @@ ipv4:
       sophia esterel5 ib0 0 0 3 4
       sophia esterel6 eth0 0 0 3 6
       sophia esterel7 eth0 0 0 3 7
+      sophia esterel7 ib0 0 0 3 7
       sophia esterel8 eth0 0 0 3 9
       sophia esterel9 eth0 0 0 3 10
       sophia esterel10 eth1 0 0 3 11
diff --git a/input/grid5000/sites/sophia/clusters/esterel7/esterel7.yaml b/input/grid5000/sites/sophia/clusters/esterel7/esterel7.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..77f2f0e1eb5a524c939a6e9fd493d15c0c9b7655
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel7/esterel7.yaml
@@ -0,0 +1,49 @@
+---
+model: Dell PowerEdge T630
+created_at: 2025-03-06
+kavlan: false
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - testing
+nodes:
+  esterel7-[1-2]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Broadwell
+      clock_speed: 2100000000
+    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
+      ib0:
+        mounted: true
+        enabled: true
+        mountable: true
+        netmask: 255.255.240.0
+    storage_devices:
+      pci-0000:03:00.0-scsi-0:2:0:0:
+        id: disk0
+        interface: RAID
+      pci-0000:03:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: RAID
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: esterel7
diff --git a/input/grid5000/sites/sophia/clusters/esterel7/esterel7_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel7/esterel7_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a59d3e58fa6e79bb6cb8b10b5f983dfcdf43b110
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel7/esterel7_metrics.yaml
@@ -0,0 +1,64 @@
+---
+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
+
+  - name: prom_nvgpu_default_metrics
+    description: Default subset of metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
+      id:
+        - DCGM_FI_DEV_SM_CLOCK
+        - DCGM_FI_DEV_MEM_CLOCK
+        - DCGM_FI_DEV_GPU_TEMP
+        - DCGM_FI_DEV_POWER_USAGE
+        - DCGM_FI_DEV_MEM_COPY_UTIL
+
+  - name: prom_nvgpu_all_metrics
+    description: All metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
diff --git a/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.yaml b/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a79c5b318878db341b37349859a5f822f4a0bc44
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-1.yaml
@@ -0,0 +1,179 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel7-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 16
+    nb_procs: 2
+    nb_threads: 32
+    platform_type: x86_64
+  bios:
+    release_date: 02/22/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T630
+    serial: BB6T5K2
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 0
+      device: "/dev/nvidia1"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia3:
+      cpu_affinity: 1
+      device: "/dev/nvidia3"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+  main_memory:
+    ram_size: 137438953472
+  memory_devices:
+    dimm_a1:
+      size: 8589934592
+      technology: dram
+    dimm_a2:
+      size: 8589934592
+      technology: dram
+    dimm_a3:
+      size: 8589934592
+      technology: dram
+    dimm_a4:
+      size: 8589934592
+      technology: dram
+    dimm_a5:
+      size: 8589934592
+      technology: dram
+    dimm_a6:
+      size: 8589934592
+      technology: dram
+    dimm_a7:
+      size: 8589934592
+      technology: dram
+    dimm_a8:
+      size: 8589934592
+      technology: dram
+    dimm_b1:
+      size: 8589934592
+      technology: dram
+    dimm_b2:
+      size: 8589934592
+      technology: dram
+    dimm_b3:
+      size: 8589934592
+      technology: dram
+    dimm_b4:
+      size: 8589934592
+      technology: dram
+    dimm_b5:
+      size: 8589934592
+      technology: dram
+    dimm_b6:
+      size: 8589934592
+      technology: dram
+    dimm_b7:
+      size: 8589934592
+      technology: dram
+    dimm_b8:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.8
+      mac: 18:66:da:a2:51:13
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      ip: 172.16.131.8
+      mac: 18:66:da:a2:51:11
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      mac: 18:66:da:a2:51:12
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.36.5000
+      guid: '0x248a070300fb51d1'
+      interface: InfiniBand
+      ip: 172.18.131.8
+      mac: 24:8a:07:03:00:fb:51:d1
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  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: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz
+    vendor: Intel
+    version: E5-2620 v4
+  storage_devices:
+    pci-0000:03:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da0b1c1480020e91fdbfc86d4a1"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      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-0x61866da0b1c1480020e920b809a7ae57"
+      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/esterel7/nodes/esterel7-2.yaml b/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ea20942f3eb1c4b1e4138c84be3a3cdeee87ab92
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel7/nodes/esterel7-2.yaml
@@ -0,0 +1,179 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel7-2:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 16
+    nb_procs: 2
+    nb_threads: 32
+    platform_type: x86_64
+  bios:
+    release_date: 02/22/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T630
+    serial: BB6Q5K2
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 0
+      device: "/dev/nvidia1"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+    nvidia3:
+      cpu_affinity: 1
+      device: "/dev/nvidia3"
+      memory: 11811160064
+      model: GeForce GTX 1080 Ti
+      power_default_limit: 250.00 W
+      vbios_version: 86.02.39.00.01
+      vendor: Nvidia
+  main_memory:
+    ram_size: 137438953472
+  memory_devices:
+    dimm_a1:
+      size: 8589934592
+      technology: dram
+    dimm_a2:
+      size: 8589934592
+      technology: dram
+    dimm_a3:
+      size: 8589934592
+      technology: dram
+    dimm_a4:
+      size: 8589934592
+      technology: dram
+    dimm_a5:
+      size: 8589934592
+      technology: dram
+    dimm_a6:
+      size: 8589934592
+      technology: dram
+    dimm_a7:
+      size: 8589934592
+      technology: dram
+    dimm_a8:
+      size: 8589934592
+      technology: dram
+    dimm_b1:
+      size: 8589934592
+      technology: dram
+    dimm_b2:
+      size: 8589934592
+      technology: dram
+    dimm_b3:
+      size: 8589934592
+      technology: dram
+    dimm_b4:
+      size: 8589934592
+      technology: dram
+    dimm_b5:
+      size: 8589934592
+      technology: dram
+    dimm_b6:
+      size: 8589934592
+      technology: dram
+    dimm_b7:
+      size: 8589934592
+      technology: dram
+    dimm_b8:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.9
+      mac: 18:66:da:a2:43:ce
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      ip: 172.16.131.9
+      mac: 18:66:da:a2:43:cc
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      mac: 18:66:da:a2:43:cd
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.36.5000
+      guid: '0x248a070300fb5091'
+      interface: InfiniBand
+      ip: 172.18.131.9
+      mac: 24:8a:07:03:00:fb:50:91
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  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: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz
+    vendor: Intel
+    version: E5-2620 v4
+  storage_devices:
+    pci-0000:03:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da0b1c1d40020e91f8d0887f027"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      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-0x61866da0b1c1d40020e9202d121ae4dc"
+      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/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 48a124e6a4775fe0d904b24546b5cdd2cd8e9113..0f7c8bf038c7169c46b0c6bd4c82d813f78cfb3a 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -382,6 +382,12 @@ esterel5:
   enp1s0f0np0: eth0
   enp1s0f1: eth1
   ibp130s0: ib0
+esterel7:
+  eno1: eth0
+  eno2: eth1
+  enp1s0f0np0: eth0
+  enp1s0f1: eth1
+  ibp130s0: ib0
 esterel10:
   eno1: eth0
   eno2: eth1