diff --git a/data/grid5000/sites/sophia/clusters/mercantour7/mercantour7.json b/data/grid5000/sites/sophia/clusters/mercantour7/mercantour7.json
new file mode 100644
index 0000000000000000000000000000000000000000..16db785fc8a02f984cf72484041fee3835218c32
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour7/mercantour7.json
@@ -0,0 +1,66 @@
+{
+ "boot_type": "uefi",
+ "created_at": "Thu, 20 Mar 2025 00:00:00 GMT",
+ "exotic": false,
+ "kavlan": false,
+ "manufactured_at": "2020-11-13",
+ "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 R7525",
+ "nodes_count": 1,
+ "nodes_description": "2 CPUs AMD EPYC 7502, 32 cores/CPU, 384GB RAM, 893GB SSD, 44709GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+ "priority": 202011,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "redfish": true,
+ "type": "cluster",
+ "uid": "mercantour7",
+ "warranty_end": "2027-11-14"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour7/nodes/mercantour7-1.json b/data/grid5000/sites/sophia/clusters/mercantour7/nodes/mercantour7-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..725b1d813791924a2087c607d8cc6320ac980046
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour7/nodes/mercantour7-1.json
@@ -0,0 +1,299 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 64,
+ "nb_procs": 2,
+ "nb_threads": 128,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "02/03/2025",
+ "vendor": "Dell Inc.",
+ "version": "2.18.1"
+ },
+ "bmc_version": "7.20.10.05",
+ "chassis": {
+ "manufactured_at": "2020-11-13",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge R7525",
+ "serial": "JN4LS73",
+ "warranty_end": "2027-11-14"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 412316860416
+ },
+ "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_a3",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a4",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a5",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a6",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a7",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a8",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a9",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a10",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a11",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a12",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b3",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b4",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b5",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b6",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b7",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b8",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b9",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b10",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b11",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b12",
+ "size": 17179869184,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "firmware_version": "FFV23.11.4 bc 5720-v1.39",
+ "interface": "Ethernet",
+ "ip": "172.16.130.47",
+ "ip6": "2001:660:4406:800:3::2f",
+ "kavlan": false,
+ "mac": "f4:02:70:b9:60:34",
+ "management": false,
+ "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "mercantour7-1.sophia.grid5000.fr",
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-3",
+ "switch_port": "1/1/19",
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth1",
+ "driver": "tg3",
+ "enabled": false,
+ "firmware_version": "FFV23.11.4 bc 5720-v1.39",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "f4:02:70:b9:60:35",
+ "management": false,
+ "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "ib0",
+ "driver": "mlx4_core",
+ "enabled": true,
+ "firmware_version": "2.42.5000",
+ "guid": "0x1c34da0300e46d11",
+ "interface": "InfiniBand",
+ "ip": "172.18.130.47",
+ "kavlan": false,
+ "mac": "1c:34:da:03:00:e4:6d:11",
+ "management": false,
+ "model": "MT27520 Family [ConnectX-3 Pro]",
+ "mountable": true,
+ "mounted": true,
+ "name": "ib0",
+ "netmask": "255.255.240.0",
+ "network_address": "mercantour7-1-ib0.sophia.grid5000.fr",
+ "rate": 40000000000,
+ "vendor": "Mellanox Technologies"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.130.47",
+ "kavlan": false,
+ "mac": "70:b5:e8:de:e8:76",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "mercantour7-1-bmc.sophia.grid5000.fr"
+ }
+ ],
+ "nodeset": "mercantour7",
+ "operating_system": {
+ "cstate_driver": "acpi_idle",
+ "cstate_governor": "menu",
+ "ht_enabled": true,
+ "pstate_driver": "acpi-cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 40000000000,
+ "node_flops": 2560000000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 524288,
+ "cache_l3": 16777216,
+ "clock_speed": 2500000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Zen 2",
+ "microcode": "0x830107d",
+ "model": "AMD EPYC",
+ "other_description": "AMD EPYC 7502 32-Core Processor",
+ "vendor": "AMD",
+ "version": 7502
+ },
+ "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-0x670b5e80db81ca0027c136530350d932",
+ "by_path": "/dev/disk/by-path/pci-0000:41:00.0-scsi-0:2:0:0",
+ "firmware_version": 5.16,
+ "id": "disk0",
+ "interface": "RAID",
+ "model": "PERC H745 Adp",
+ "size": 959656755200,
+ "storage": "SSD",
+ "vendor": "Dell"
+ },
+ {
+ "by_id": "/dev/disk/by-id/wwn-0x670b5e80db81ca0027c13b3347a1dd0f",
+ "by_path": "/dev/disk/by-path/pci-0000:41:00.0-scsi-0:2:1:0",
+ "firmware_version": 5.16,
+ "id": "disk1",
+ "interface": "RAID",
+ "model": "PERC H745 Adp",
+ "size": 48005923209216,
+ "storage": "HDD",
+ "vendor": "Dell"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "virtual": "amd-v"
+ },
+ "type": "node",
+ "uid": "mercantour7-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-3.json b/data/grid5000/sites/sophia/network_equipments/sw-3.json
index f82fd23ff166af45be98406464659cb168395d40..eb3c548c9b7b4114a1d8ff48a809a0eb14689971 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-3.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-3.json
@@ -107,6 +107,10 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/19",
+ "uid": "mercantour7-1"
},
{
},
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index c586a52779bda508844403e1d7a17618349d10e4..1d245811c150e0eb8e0c36236c9ef9fca6104e20 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2316,6 +2316,12 @@ sites:
chassis:
manufactured_at: 2020-10-05
warranty_end: 2027-10-07
+ mercantour7:
+ nodes:
+ mercantour7-1:
+ chassis:
+ manufactured_at: 2020-11-13
+ warranty_end: 2027-11-14
uvb:
nodes:
uvb-10:
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 0013acdb5cc6cf02359b42dc4873dcbc3281c433..4f3edd9894fa4f61953f738c043d63d59c2612a7 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -15,6 +15,7 @@ disk_vendor_model_mapping:
- PERC H345 Front
- PERC H745P MX
- PERC H745 Frnt
+ - PERC H745 Adp
- PERC H740P Mini
- DELLBOSS VD
HPE:
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index a197eecf231cedf282742ccaf8eab1cca8fc032d..a4f41c9f7bbf4d7372757a731b48281bca3a5a36 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -153,6 +153,7 @@ ipv4:
sophia mercantour6 eth0 0 0 2 45
sophia mercantour6 ib0 0 0 2 45
sophia mercantour7 eth0 0 0 2 46
+ sophia mercantour7 ib0 0 0 2 46
sophia esterel1 eth0 0 0 3 0
sophia esterel1 ib0 0 0 3 0
sophia esterel2 eth0 0 0 3 1
diff --git a/input/grid5000/sites/sophia/clusters/mercantour7/mercantour7.yaml b/input/grid5000/sites/sophia/clusters/mercantour7/mercantour7.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a03f6ac5c42ce272dd7acb25fc85943d1fa676e3
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour7/mercantour7.yaml
@@ -0,0 +1,49 @@
+---
+model: Dell PowerEdge R7525
+created_at: 2025-03-20
+kavlan: false
+boot_type: uefi
+exotic: false
+queues:
+ - admin
+ - testing
+nodes:
+ mercantour7-1:
+ supported_job_types:
+ deploy: true
+ besteffort: true
+ max_walltime: 0
+ processor:
+ microarchitecture: Zen 2
+ clock_speed: 2500000000
+ 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:41:00.0-scsi-0:2:0:0:
+ id: disk0
+ interface: RAID
+ pci-0000:41:00.0-scsi-0:2:1:0:
+ id: disk1
+ interface: RAID
+ software:
+ standard-environment: debian11-x64-std
+ management_tools:
+ bmc_vendor_tool: racadm
+ nodeset: mercantour7
diff --git a/input/grid5000/sites/sophia/clusters/mercantour7/mercantour7_metrics.yaml b/input/grid5000/sites/sophia/clusters/mercantour7/mercantour7_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3c11d0073c1eaf21ed82b43e7c5efa5407ecd189
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour7/mercantour7_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/sophia/clusters/mercantour7/nodes/mercantour7-1.yaml b/input/grid5000/sites/sophia/clusters/mercantour7/nodes/mercantour7-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..75fa5c035f847fc003f201293c7d44ee49c92a9b
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour7/nodes/mercantour7-1.yaml
@@ -0,0 +1,170 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour7-1:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 64
+ nb_procs: 2
+ nb_threads: 128
+ platform_type: x86_64
+ bios:
+ release_date: 02/03/2025
+ vendor: Dell Inc.
+ version: 2.18.1
+ bmc_version: 7.20.10.05
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge R7525
+ serial: JN4LS73
+ main_memory:
+ ram_size: 412316860416
+ memory_devices:
+ dimm_a1:
+ size: 17179869184
+ technology: dram
+ dimm_a10:
+ size: 17179869184
+ technology: dram
+ dimm_a11:
+ size: 17179869184
+ technology: dram
+ dimm_a12:
+ size: 17179869184
+ technology: dram
+ dimm_a2:
+ size: 17179869184
+ technology: dram
+ dimm_a3:
+ size: 17179869184
+ technology: dram
+ dimm_a4:
+ size: 17179869184
+ technology: dram
+ dimm_a5:
+ size: 17179869184
+ technology: dram
+ dimm_a6:
+ size: 17179869184
+ technology: dram
+ dimm_a7:
+ size: 17179869184
+ technology: dram
+ dimm_a8:
+ size: 17179869184
+ technology: dram
+ dimm_a9:
+ size: 17179869184
+ technology: dram
+ dimm_b1:
+ size: 17179869184
+ technology: dram
+ dimm_b10:
+ size: 17179869184
+ technology: dram
+ dimm_b11:
+ size: 17179869184
+ technology: dram
+ dimm_b12:
+ size: 17179869184
+ technology: dram
+ dimm_b2:
+ size: 17179869184
+ technology: dram
+ dimm_b3:
+ size: 17179869184
+ technology: dram
+ dimm_b4:
+ size: 17179869184
+ technology: dram
+ dimm_b5:
+ size: 17179869184
+ technology: dram
+ dimm_b6:
+ size: 17179869184
+ technology: dram
+ dimm_b7:
+ size: 17179869184
+ technology: dram
+ dimm_b8:
+ size: 17179869184
+ technology: dram
+ dimm_b9:
+ size: 17179869184
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.130.47
+ mac: 70:b5:e8:de:e8:76
+ management: true
+ eth0:
+ driver: tg3
+ firmware_version: FFV23.11.4 bc 5720-v1.39
+ interface: Ethernet
+ ip: 172.16.130.47
+ mac: f4:02:70:b9:60:34
+ management: false
+ model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+ name: enp1s0f0np0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth1:
+ driver: tg3
+ firmware_version: FFV23.11.4 bc 5720-v1.39
+ interface: Ethernet
+ mac: f4:02:70:b9:60:35
+ management: false
+ model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+ name: eno2
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ ib0:
+ driver: mlx4_core
+ firmware_version: 2.42.5000
+ guid: '0x1c34da0300e46d11'
+ interface: InfiniBand
+ ip: 172.18.130.47
+ mac: 1c:34:da:03:00:e4:6d:11
+ management: false
+ model: MT27520 Family [ConnectX-3 Pro]
+ name: ib0
+ rate: 40000000000
+ vendor: Mellanox Technologies
+ operating_system:
+ cstate_driver: acpi_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: acpi-cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 524288
+ cache_l3: 16777216
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x830107d'
+ model: AMD EPYC
+ other_description: AMD EPYC 7502 32-Core Processor
+ vendor: AMD
+ version: 7502
+ storage_devices:
+ pci-0000:41:00.0-scsi-0:2:0:0:
+ by_id: "/dev/disk/by-id/wwn-0x670b5e80db81ca0027c136530350d932"
+ by_path: "/dev/disk/by-path/pci-0000:41:00.0-scsi-0:2:0:0"
+ firmware_version: 5.16
+ model: PERC H745 Adp
+ size: 959656755200
+ storage: SSD
+ pci-0000:41:00.0-scsi-0:2:1:0:
+ by_id: "/dev/disk/by-id/wwn-0x670b5e80db81ca0027c13b3347a1dd0f"
+ by_path: "/dev/disk/by-path/pci-0000:41:00.0-scsi-0:2:1:0"
+ firmware_version: 5.16
+ model: PERC H745 Adp
+ size: 48005923209216
+ storage: HDD
+ supported_job_types:
+ virtual: amd-v
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
index 83b37d59a7fac5bce1af9e8276caa66d620e2f3e..0710ee1eccc1613f554b3f3fbbbc23bceed2a07b 100644
--- a/input/grid5000/sites/sophia/networks/sw-3.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -44,6 +44,8 @@ sw-3:
uid: mercantour2-4
17:
uid: mercantour6-1
+ 19:
+ uid: mercantour7-1
28:
uid: mercantour5-1
29:
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 5b815d846da0837a812f4e4fd55bf17f3d3d2903..ec69940e69ad11630dc2d022fd939d5e3bf401a5 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -237,6 +237,11 @@ mercantour6:
eno1: eth0
eno2: eth1
ibp65s0: ib0
+mercantour7:
+ enp1s0f0np0: eth0
+ eno1: eth0
+ eno2: eth1
+ ibp161s0: ib0
montcalm:
ens10f0np0: eth0
ens10f1np1: eth1