diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
new file mode 100644
index 0000000000000000000000000000000000000000..ff54a74aaa5e8e1628e72861be30bdbfb92cc120
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
@@ -0,0 +1,15 @@
+{
+  "boot_type": "uefi",
+  "created_at": "Thu, 01 Dec 2022 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "metrics": [
+
+  ],
+  "model": "HPE Proliant DL360 Gen10+",
+  "queues": [
+    "admin"
+  ],
+  "type": "cluster",
+  "uid": "montcalm"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..fcc9af85ff25ca4944e4dd1af429750baae10999
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
@@ -0,0 +1,125 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 64,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/01/2000",
+    "vendor": "Unknown",
+    "version": "Unknown"
+  },
+  "bmc_version": "Unknown",
+  "chassis": {
+    "manufacturer": "HPe",
+    "name": "HPE Proliant DL360 Gen10+"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 549755813888
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "ipmitool",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a0",
+      "size": 1024,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "bridged": false,
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.120.1",
+      "ip6": "2001:660:4406:900:9::1",
+      "kavlan": false,
+      "mac": "84:16:0c:4b:9b:36",
+      "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "ens10f0np0",
+      "network_address": "montcalm-1.toulouse.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw-toulouse",
+      "switch_port": "tengigabitethernet1/1/1",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.120.1",
+      "kavlan": false,
+      "mac": "5c:ed:8c:3b:14:8a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "montcalm-1-bmc.toulouse.grid5000.fr"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 108800000000,
+    "node_flops": 1740800000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 98304,
+    "cache_l1i": 65536,
+    "cache_l2": 2621440,
+    "cache_l3": 3145728,
+    "clock_speed": 3400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Ice Lake",
+    "microcode": "Unknown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "Silver 4314"
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023031510",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "HPE P40498-B21",
+      "size": 1030792151040,
+      "storage": "SSD",
+      "vendor": "HP"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin"
+    ]
+  },
+  "type": "node",
+  "uid": "montcalm-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..67f4c32f53643594be2ed38a19a5bb93090950c1
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
@@ -0,0 +1,125 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 64,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/01/2000",
+    "vendor": "Unknown",
+    "version": "Unknown"
+  },
+  "bmc_version": "Unknown",
+  "chassis": {
+    "manufacturer": "HPe",
+    "name": "HPE Proliant DL360 Gen10+"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 549755813888
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "ipmitool",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a0",
+      "size": 1024,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "bridged": false,
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.120.2",
+      "ip6": "2001:660:4406:900:9::2",
+      "kavlan": false,
+      "mac": "84:16:0c:4a:29:04",
+      "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "ens10f0np0",
+      "network_address": "montcalm-2.toulouse.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw-toulouse",
+      "switch_port": "tengigabitethernet1/1/2",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.120.2",
+      "kavlan": false,
+      "mac": "5c:ed:8c:3b:d1:88",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "montcalm-2-bmc.toulouse.grid5000.fr"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 108800000000,
+    "node_flops": 1740800000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 98304,
+    "cache_l1i": 65536,
+    "cache_l2": 2621440,
+    "cache_l3": 3145728,
+    "clock_speed": 3400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Ice Lake",
+    "microcode": "Unknown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "Silver 4314"
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023031510",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "HPE P40498-B21",
+      "size": 1030792151040,
+      "storage": "SSD",
+      "vendor": "HP"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin"
+    ]
+  },
+  "type": "node",
+  "uid": "montcalm-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..c573de6e6c665e7373ecd8e99087a5a36f13806d
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
@@ -0,0 +1,125 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 64,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/01/2000",
+    "vendor": "Unknown",
+    "version": "Unknown"
+  },
+  "bmc_version": "Unknown",
+  "chassis": {
+    "manufacturer": "HPe",
+    "name": "HPE Proliant DL360 Gen10+"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 549755813888
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "ipmitool",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a0",
+      "size": 1024,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "bridged": false,
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.120.3",
+      "ip6": "2001:660:4406:900:9::3",
+      "kavlan": false,
+      "mac": "84:16:0c:4b:fe:6c",
+      "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "ens10f0np0",
+      "network_address": "montcalm-3.toulouse.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw-toulouse",
+      "switch_port": "tengigabitethernet1/1/3",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.120.3",
+      "kavlan": false,
+      "mac": "5c:ed:8c:3b:14:44",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "montcalm-3-bmc.toulouse.grid5000.fr"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 108800000000,
+    "node_flops": 1740800000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 98304,
+    "cache_l1i": 65536,
+    "cache_l2": 2621440,
+    "cache_l3": 3145728,
+    "clock_speed": 3400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Ice Lake",
+    "microcode": "Unknown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "Silver 4314"
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023031510",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "HPE P40498-B21",
+      "size": 1030792151040,
+      "storage": "SSD",
+      "vendor": "HP"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin"
+    ]
+  },
+  "type": "node",
+  "uid": "montcalm-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..b45d620610cbef71ea455757592c7ed276c241a4
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
@@ -0,0 +1,125 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 64,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/01/2000",
+    "vendor": "Unknown",
+    "version": "Unknown"
+  },
+  "bmc_version": "Unknown",
+  "chassis": {
+    "manufacturer": "HPe",
+    "name": "HPE Proliant DL360 Gen10+"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 549755813888
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "ipmitool",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a0",
+      "size": 1024,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "bridged": false,
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.120.4",
+      "ip6": "2001:660:4406:900:9::4",
+      "kavlan": false,
+      "mac": "84:16:0c:4b:de:14",
+      "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "ens10f0np0",
+      "network_address": "montcalm-4.toulouse.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw-toulouse",
+      "switch_port": "tengigabitethernet1/1/4",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.120.4",
+      "kavlan": false,
+      "mac": "5c:ed:8c:3b:14:94",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "montcalm-4-bmc.toulouse.grid5000.fr"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 108800000000,
+    "node_flops": 1740800000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 98304,
+    "cache_l1i": 65536,
+    "cache_l2": 2621440,
+    "cache_l3": 3145728,
+    "clock_speed": 3400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Ice Lake",
+    "microcode": "Unknown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "Silver 4314"
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023031510",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "HPE P40498-B21",
+      "size": 1030792151040,
+      "storage": "SSD",
+      "vendor": "HP"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin"
+    ]
+  },
+  "type": "node",
+  "uid": "montcalm-4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
new file mode 100644
index 0000000000000000000000000000000000000000..2c0e29d5973efcbfc7dc24aedeb0553db1062ab9
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
@@ -0,0 +1,125 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 64,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/01/2000",
+    "vendor": "Unknown",
+    "version": "Unknown"
+  },
+  "bmc_version": "Unknown",
+  "chassis": {
+    "manufacturer": "HPe",
+    "name": "HPE Proliant DL360 Gen10+"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 549755813888
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "ipmitool",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a0",
+      "size": 1024,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "bridged": false,
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.120.5",
+      "ip6": "2001:660:4406:900:9::5",
+      "kavlan": false,
+      "mac": "84:16:0c:4b:1a:ae",
+      "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "ens10f0np0",
+      "network_address": "montcalm-5.toulouse.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw-toulouse",
+      "switch_port": "tengigabitethernet1/1/5",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.120.5",
+      "kavlan": false,
+      "mac": "5c:ed:8c:3b:14:e8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "montcalm-5-bmc.toulouse.grid5000.fr"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 108800000000,
+    "node_flops": 1740800000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 98304,
+    "cache_l1i": 65536,
+    "cache_l2": 2621440,
+    "cache_l3": 3145728,
+    "clock_speed": 3400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Ice Lake",
+    "microcode": "Unknown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "Silver 4314"
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023031510",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "HPE P40498-B21",
+      "size": 1030792151040,
+      "storage": "SSD",
+      "vendor": "HP"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin"
+    ]
+  },
+  "type": "node",
+  "uid": "montcalm-5"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..7cbbc64a1484c0cd303b31a37e94cfa9ca1b1f70
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
@@ -0,0 +1,125 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 64,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/01/2000",
+    "vendor": "Unknown",
+    "version": "Unknown"
+  },
+  "bmc_version": "Unknown",
+  "chassis": {
+    "manufacturer": "HPe",
+    "name": "HPE Proliant DL360 Gen10+"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 549755813888
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "ipmitool",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a0",
+      "size": 1024,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "bridged": false,
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.120.6",
+      "ip6": "2001:660:4406:900:9::6",
+      "kavlan": false,
+      "mac": "84:16:0c:4b:cd:8e",
+      "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "ens10f0np0",
+      "network_address": "montcalm-6.toulouse.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw-toulouse",
+      "switch_port": "tengigabitethernet1/1/6",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.120.6",
+      "kavlan": false,
+      "mac": "5c:ed:8c:3b:14:f0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "montcalm-6-bmc.toulouse.grid5000.fr"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 108800000000,
+    "node_flops": 1740800000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 98304,
+    "cache_l1i": 65536,
+    "cache_l2": 2621440,
+    "cache_l3": 3145728,
+    "clock_speed": 3400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Ice Lake",
+    "microcode": "Unknown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "Silver 4314"
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023031510",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "HPE P40498-B21",
+      "size": 1030792151040,
+      "storage": "SSD",
+      "vendor": "HP"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin"
+    ]
+  },
+  "type": "node",
+  "uid": "montcalm-6"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
new file mode 100644
index 0000000000000000000000000000000000000000..a9886bacac93d539d3ac471db8e1515d3bbb8c65
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
@@ -0,0 +1,125 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 64,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/01/2000",
+    "vendor": "Unknown",
+    "version": "Unknown"
+  },
+  "bmc_version": "Unknown",
+  "chassis": {
+    "manufacturer": "HPe",
+    "name": "HPE Proliant DL360 Gen10+"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 549755813888
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "ipmitool",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a0",
+      "size": 1024,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "bridged": false,
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.120.7",
+      "ip6": "2001:660:4406:900:9::7",
+      "kavlan": false,
+      "mac": "84:16:0c:4b:c1:88",
+      "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "ens10f0np0",
+      "network_address": "montcalm-7.toulouse.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw-toulouse",
+      "switch_port": "tengigabitethernet1/1/7",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.120.7",
+      "kavlan": false,
+      "mac": "5c:ed:8c:3b:14:16",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "montcalm-7-bmc.toulouse.grid5000.fr"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 108800000000,
+    "node_flops": 1740800000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 98304,
+    "cache_l1i": 65536,
+    "cache_l2": 2621440,
+    "cache_l3": 3145728,
+    "clock_speed": 3400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Ice Lake",
+    "microcode": "Unknown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "Silver 4314"
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023031510",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "HPE P40498-B21",
+      "size": 1030792151040,
+      "storage": "SSD",
+      "vendor": "HP"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin"
+    ]
+  },
+  "type": "node",
+  "uid": "montcalm-7"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d31e05d201317478de5e1b091c8f64e98942cfd
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
@@ -0,0 +1,125 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 64,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/01/2000",
+    "vendor": "Unknown",
+    "version": "Unknown"
+  },
+  "bmc_version": "Unknown",
+  "chassis": {
+    "manufacturer": "HPe",
+    "name": "HPE Proliant DL360 Gen10+"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 549755813888
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "ipmitool",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a0",
+      "size": 1024,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "bridged": false,
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.120.8",
+      "ip6": "2001:660:4406:900:9::8",
+      "kavlan": false,
+      "mac": "84:16:0c:4b:cd:46",
+      "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "ens10f0np0",
+      "network_address": "montcalm-8.toulouse.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw-toulouse",
+      "switch_port": "tengigabitethernet1/1/8",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.120.8",
+      "kavlan": false,
+      "mac": "5c:ed:8c:3b:14:ec",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "montcalm-8-bmc.toulouse.grid5000.fr"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 108800000000,
+    "node_flops": 1740800000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 98304,
+    "cache_l1i": 65536,
+    "cache_l2": 2621440,
+    "cache_l3": 3145728,
+    "clock_speed": 3400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Ice Lake",
+    "microcode": "Unknown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "Silver 4314"
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023031510",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "HPE P40498-B21",
+      "size": 1030792151040,
+      "storage": "SSD",
+      "vendor": "HP"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin"
+    ]
+  },
+  "type": "node",
+  "uid": "montcalm-8"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
new file mode 100644
index 0000000000000000000000000000000000000000..3d2ee9b4702f080b71650bb16954221b8ee84fc1
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
@@ -0,0 +1,125 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 64,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "01/01/2000",
+    "vendor": "Unknown",
+    "version": "Unknown"
+  },
+  "bmc_version": "Unknown",
+  "chassis": {
+    "manufacturer": "HPe",
+    "name": "HPE Proliant DL360 Gen10+"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 549755813888
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "ipmitool",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a0",
+      "size": 1024,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "bridged": false,
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.120.9",
+      "ip6": "2001:660:4406:900:9::9",
+      "kavlan": false,
+      "mac": "84:16:0c:4b:2e:28",
+      "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "ens10f0np0",
+      "network_address": "montcalm-9.toulouse.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw-toulouse",
+      "switch_port": "tengigabitethernet1/1/9",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.120.9",
+      "kavlan": false,
+      "mac": "5c:ed:8c:3b:d1:8a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "montcalm-9-bmc.toulouse.grid5000.fr"
+    }
+  ],
+  "operating_system": {
+    "cstate_driver": "none",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 108800000000,
+    "node_flops": 1740800000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 98304,
+    "cache_l1i": 65536,
+    "cache_l2": 2621440,
+    "cache_l3": 3145728,
+    "clock_speed": 3400000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Ice Lake",
+    "microcode": "Unknown",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+    "vendor": "Intel",
+    "version": "Silver 4314"
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023031510",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "HPE P40498-B21",
+      "size": 1030792151040,
+      "storage": "SSD",
+      "vendor": "HP"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin"
+    ]
+  },
+  "type": "node",
+  "uid": "montcalm-9"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
new file mode 100644
index 0000000000000000000000000000000000000000..cb470b6006acb9be7198b7893dba703a92930573
--- /dev/null
+++ b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
@@ -0,0 +1,196 @@
+{
+  "ip": "172.17.127.254",
+  "kind": "router",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "tengigabitethernet1/1/1",
+          "uid": "montcalm-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "tengigabitethernet1/1/2",
+          "uid": "montcalm-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "tengigabitethernet1/1/3",
+          "uid": "montcalm-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "tengigabitethernet1/1/4",
+          "uid": "montcalm-4"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "tengigabitethernet1/1/5",
+          "uid": "montcalm-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "tengigabitethernet1/1/6",
+          "uid": "montcalm-6"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "tengigabitethernet1/1/7",
+          "uid": "montcalm-7"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "tengigabitethernet1/1/8",
+          "uid": "montcalm-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "tengigabitethernet1/1/9",
+          "uid": "montcalm-9"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "server",
+          "snmp_name": "tengigabitethernet1/1/15",
+          "uid": "oobm"
+        },
+        {
+          "kind": "server",
+          "snmp_name": "tengigabitethernet1/1/16",
+          "uid": "oobm"
+        },
+        {
+          "kind": "server",
+          "snmp_name": "tengigabitethernet1/1/17",
+          "uid": "pve-1"
+        },
+        {
+          "kind": "server",
+          "snmp_name": "tengigabitethernet1/1/18",
+          "uid": "pve-2"
+        },
+        {
+          "kind": "server",
+          "snmp_name": "tengigabitethernet1/1/19",
+          "uid": "nfs"
+        },
+        {
+          "kind": "server",
+          "snmp_name": "tengigabitethernet1/1/20",
+          "uid": "nfs"
+        }
+      ],
+      "rate": 10000000000,
+      "snmp_pattern": "tengigabitethernet1/%LINECARD%/%PORT%"
+    }
+  ],
+  "model": "Temporary-Dell-OS6",
+  "serial": "unknown",
+  "site": "toulouse",
+  "snmp_community": "Unknown",
+  "type": "network_equipment",
+  "uid": "gw-toulouse",
+  "vlans": {
+    "vlan100": {
+      "addresses": [
+        "172.16.127.254"
+      ],
+      "administrative": true
+    },
+    "vlan101": {
+      "addresses": [
+        "172.17.127.254"
+      ]
+    },
+    "vlan500": {
+      "addresses": [
+        "192.168.4.16"
+      ]
+    },
+    "vlan701": {
+      "addresses": [
+        "192.168.192.0/20"
+      ],
+      "name": "kavlan-1"
+    },
+    "vlan702": {
+      "addresses": [
+        "192.168.208.0/20"
+      ],
+      "name": "kavlan-2"
+    },
+    "vlan703": {
+      "addresses": [
+        "192.168.224.0/20"
+      ],
+      "name": "kavlan-3"
+    },
+    "vlan704": {
+      "addresses": [
+        "10.28.0.0/18"
+      ],
+      "name": "kavlan-4"
+    },
+    "vlan705": {
+      "addresses": [
+        "10.28.64.0/18"
+      ],
+      "name": "kavlan-5"
+    },
+    "vlan706": {
+      "addresses": [
+        "10.28.128.0/18"
+      ],
+      "name": "kavlan-6"
+    },
+    "vlan707": {
+      "addresses": [
+        "10.28.192.0/18"
+      ],
+      "name": "kavlan-7"
+    },
+    "vlan708": {
+      "addresses": [
+        "10.29.0.0/18"
+      ],
+      "name": "kavlan-8"
+    },
+    "vlan709": {
+      "addresses": [
+        "10.29.64.0/18"
+      ],
+      "name": "kavlan-9"
+    },
+    "vlan712": {
+      "addresses": [
+        "10.31.192.0/18"
+      ],
+      "name": "kavlan-17"
+    }
+  }
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/pdus/epdu-d.json b/data/grid5000/sites/toulouse/pdus/epdu-d.json
new file mode 100644
index 0000000000000000000000000000000000000000..1725b5bdfe266ec7056aff3a9934e95387267a90
--- /dev/null
+++ b/data/grid5000/sites/toulouse/pdus/epdu-d.json
@@ -0,0 +1,8 @@
+{
+  "ip": "172.17.127.4",
+  "mac": "00:20:85:d7:9f:ea",
+  "model": "unknown",
+  "type": "pdu",
+  "uid": "epdu-d",
+  "vendor": "eaton"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/pdus/epdu-g.json b/data/grid5000/sites/toulouse/pdus/epdu-g.json
new file mode 100644
index 0000000000000000000000000000000000000000..a619c254c27c97cc514e8f7285b5d2624aa38a17
--- /dev/null
+++ b/data/grid5000/sites/toulouse/pdus/epdu-g.json
@@ -0,0 +1,8 @@
+{
+  "ip": "172.17.127.5",
+  "mac": "00:20:85:d7:9f:ef",
+  "model": "unknown",
+  "type": "pdu",
+  "uid": "epdu-g",
+  "vendor": "eaton"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/api-proxy.json b/data/grid5000/sites/toulouse/servers/api-proxy.json
new file mode 100644
index 0000000000000000000000000000000000000000..6890a753cf21de139f16685b961eeb104c2e4003
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/api-proxy.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.115"
+    }
+  },
+  "type": "server",
+  "uid": "api-proxy"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/api-server-devel.json b/data/grid5000/sites/toulouse/servers/api-server-devel.json
new file mode 100644
index 0000000000000000000000000000000000000000..6c27261c5a2c5b452e15cc3af42524c9360e09f3
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/api-server-devel.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.114"
+    }
+  },
+  "type": "server",
+  "uid": "api-server-devel"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/api-server-v3.json b/data/grid5000/sites/toulouse/servers/api-server-v3.json
new file mode 100644
index 0000000000000000000000000000000000000000..1b9bff179599653d2aee4c198221302075f3fc9a
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/api-server-v3.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.112"
+    }
+  },
+  "type": "server",
+  "uid": "api-server-v3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/conman.json b/data/grid5000/sites/toulouse/servers/conman.json
new file mode 100644
index 0000000000000000000000000000000000000000..6a3b65f0b772d65bf8e552328c268fae71d9cb65
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/conman.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.113"
+    }
+  },
+  "type": "server",
+  "uid": "conman"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/dhcp.json b/data/grid5000/sites/toulouse/servers/dhcp.json
new file mode 100644
index 0000000000000000000000000000000000000000..3ee5482bd2e3934b56ec2c73fdffcbcf4f9401ef
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/dhcp.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.109"
+    }
+  },
+  "type": "server",
+  "uid": "dhcp"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/dns.json b/data/grid5000/sites/toulouse/servers/dns.json
new file mode 100644
index 0000000000000000000000000000000000000000..22b9f01b554f6db063719296593e0cadc24ffb8a
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/dns.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.107"
+    }
+  },
+  "type": "server",
+  "uid": "dns"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/ftoulouse.json b/data/grid5000/sites/toulouse/servers/ftoulouse.json
new file mode 100644
index 0000000000000000000000000000000000000000..785be3218461b7431e6f0912bb386147a7768ef1
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/ftoulouse.json
@@ -0,0 +1,14 @@
+{
+  "alias": [
+    "oar-api",
+    "frontend"
+  ],
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.110"
+    }
+  },
+  "type": "server",
+  "uid": "ftoulouse"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/guix.json b/data/grid5000/sites/toulouse/servers/guix.json
new file mode 100644
index 0000000000000000000000000000000000000000..72d577f663faad2654c955d43d1264b61a1349c4
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/guix.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.123"
+    }
+  },
+  "type": "server",
+  "uid": "guix"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/kadeploy-devel.json b/data/grid5000/sites/toulouse/servers/kadeploy-devel.json
new file mode 100644
index 0000000000000000000000000000000000000000..3b45978e5de1d81e568f877bcf7d72070a666735
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/kadeploy-devel.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.121"
+    }
+  },
+  "type": "server",
+  "uid": "kadeploy-devel"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/kadeploy.json b/data/grid5000/sites/toulouse/servers/kadeploy.json
new file mode 100644
index 0000000000000000000000000000000000000000..1b1c8af57ac6fa4d3bf037e29eb656f4ca411ad7
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/kadeploy.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.111"
+    }
+  },
+  "type": "server",
+  "uid": "kadeploy"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/kavlan-1.json b/data/grid5000/sites/toulouse/servers/kavlan-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..fee8a00d7204221cd9406be170661108c3b5486c
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/kavlan-1.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.118"
+    }
+  },
+  "type": "server",
+  "uid": "kavlan-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/kavlan-2.json b/data/grid5000/sites/toulouse/servers/kavlan-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..73cf27de933ad4a680fe3171580db773cccbd3a9
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/kavlan-2.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.119"
+    }
+  },
+  "type": "server",
+  "uid": "kavlan-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/kavlan-3.json b/data/grid5000/sites/toulouse/servers/kavlan-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..014d1ab2a685cccff9826a0f2917817c3a864398
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/kavlan-3.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.120"
+    }
+  },
+  "type": "server",
+  "uid": "kavlan-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/kavlan-agent.json b/data/grid5000/sites/toulouse/servers/kavlan-agent.json
new file mode 100644
index 0000000000000000000000000000000000000000..fc27390ae3f257a0955445621eba7405e87a9685
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/kavlan-agent.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.125"
+    }
+  },
+  "type": "server",
+  "uid": "kavlan-agent"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/kavlan.json b/data/grid5000/sites/toulouse/servers/kavlan.json
new file mode 100644
index 0000000000000000000000000000000000000000..e2df87536c962f47c734024055af8cb1631068e9
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/kavlan.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.117"
+    }
+  },
+  "type": "server",
+  "uid": "kavlan"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/kwollect.json b/data/grid5000/sites/toulouse/servers/kwollect.json
new file mode 100644
index 0000000000000000000000000000000000000000..a842924d3af163c830bb1ea65a9d636266cece21
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/kwollect.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.124"
+    }
+  },
+  "type": "server",
+  "uid": "kwollect"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/ldap.json b/data/grid5000/sites/toulouse/servers/ldap.json
new file mode 100644
index 0000000000000000000000000000000000000000..7642c9e0705deada10fcb77b119eaefc4e07da50
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/ldap.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.106"
+    }
+  },
+  "type": "server",
+  "uid": "ldap"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/mail.json b/data/grid5000/sites/toulouse/servers/mail.json
new file mode 100644
index 0000000000000000000000000000000000000000..a3ec630461ca2f2f273faf6912169a711d46155a
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/mail.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.105"
+    }
+  },
+  "type": "server",
+  "uid": "mail"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/nat.json b/data/grid5000/sites/toulouse/servers/nat.json
new file mode 100644
index 0000000000000000000000000000000000000000..8b02fa8b7e420c18c1b51aac0aa4cd5d29c21efc
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/nat.json
@@ -0,0 +1,13 @@
+{
+  "alias": [
+    "access"
+  ],
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.200"
+    }
+  },
+  "type": "server",
+  "uid": "nat"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/oar.json b/data/grid5000/sites/toulouse/servers/oar.json
new file mode 100644
index 0000000000000000000000000000000000000000..4ceeaf776e21db26a727a0659059b7e3a8d0946a
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/oar.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.116"
+    }
+  },
+  "type": "server",
+  "uid": "oar"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/oobm.json b/data/grid5000/sites/toulouse/servers/oobm.json
new file mode 100644
index 0000000000000000000000000000000000000000..e2b4ddebe93e1f9959a0f7939d3027bd7ba6e033
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/oobm.json
@@ -0,0 +1,14 @@
+{
+  "alias": [
+    "x-bmc"
+  ],
+  "kind": "physical",
+  "network_adapters": {
+    "default": {
+      "ip": "172.17.121.1",
+      "mac": "00:30:64:37:c8:c8"
+    }
+  },
+  "type": "server",
+  "uid": "oobm"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/oxidized.json b/data/grid5000/sites/toulouse/servers/oxidized.json
new file mode 100644
index 0000000000000000000000000000000000000000..de3bf7407459cef17e0f244e30452be7c4a1d735
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/oxidized.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.122"
+    }
+  },
+  "type": "server",
+  "uid": "oxidized"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/puppet6.json b/data/grid5000/sites/toulouse/servers/puppet6.json
new file mode 100644
index 0000000000000000000000000000000000000000..94c780b3d3652ab27d33e3bcec485bbbed6501ab
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/puppet6.json
@@ -0,0 +1,13 @@
+{
+  "alias": [
+    "puppet"
+  ],
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.108"
+    }
+  },
+  "type": "server",
+  "uid": "puppet6"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/pve-1.json b/data/grid5000/sites/toulouse/servers/pve-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..2da78cdcccef45c6958a2ba602b8c7aa41148b1b
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/pve-1.json
@@ -0,0 +1,22 @@
+{
+  "alias": [
+    "ntp"
+  ],
+  "kind": "physical",
+  "network_adapters": {
+    "adm": {
+      "ip": "172.17.127.1"
+    },
+    "bmc": {
+      "ip": "172.17.126.1",
+      "mac": "5c:ba:2c:ae:5f:50"
+    },
+    "default": {
+      "ip": "172.16.127.1",
+      "mac": "d4:f5:ef:56:04:c0"
+    }
+  },
+  "serial": "CZJ2170NK8",
+  "type": "server",
+  "uid": "pve-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/pve-2.json b/data/grid5000/sites/toulouse/servers/pve-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..3613221e75aad3cf2a47a5a3875519dd5061da45
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/pve-2.json
@@ -0,0 +1,19 @@
+{
+  "kind": "physical",
+  "network_adapters": {
+    "adm": {
+      "ip": "172.17.127.2"
+    },
+    "bmc": {
+      "ip": "172.17.126.2",
+      "mac": "5c:ba:2c:4e:5f:5e"
+    },
+    "default": {
+      "ip": "172.16.127.2",
+      "mac": "d4:f5:ef:56:04:c0"
+    }
+  },
+  "serial": "CZJ2170NK9",
+  "type": "server",
+  "uid": "pve-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/srv-data.json b/data/grid5000/sites/toulouse/servers/srv-data.json
new file mode 100644
index 0000000000000000000000000000000000000000..d43566891959e99809b3007cb0a678d94d5397e9
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/srv-data.json
@@ -0,0 +1,24 @@
+{
+  "alias": [
+    "nfs",
+    "home-g5k",
+    "modules"
+  ],
+  "kind": "physical",
+  "network_adapters": {
+    "adm": {
+      "ip": "172.17.127.3"
+    },
+    "bmc": {
+      "ip": "172.17.126.3",
+      "mac": "5c:ba:2c:29:08:1a"
+    },
+    "default": {
+      "ip": "172.16.127.3",
+      "mac": "d4:f5:ef:32:2a:40"
+    }
+  },
+  "serial": "CZ22230FL8",
+  "type": "server",
+  "uid": "srv-data"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/supervision2.json b/data/grid5000/sites/toulouse/servers/supervision2.json
new file mode 100644
index 0000000000000000000000000000000000000000..c91756f25a56b5b6572dc786fdd4443a7b67f2fa
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/supervision2.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.103"
+    }
+  },
+  "type": "server",
+  "uid": "supervision2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/syslog.json b/data/grid5000/sites/toulouse/servers/syslog.json
new file mode 100644
index 0000000000000000000000000000000000000000..4813cb46b29a82e4f0dbb504c456289d8daf483d
--- /dev/null
+++ b/data/grid5000/sites/toulouse/servers/syslog.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.127.104"
+    }
+  },
+  "type": "server",
+  "uid": "syslog"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/toulouse.json b/data/grid5000/sites/toulouse/toulouse.json
new file mode 100644
index 0000000000000000000000000000000000000000..c7e7a5b0ea3f0cec872e531f637faa7dc50fe436
--- /dev/null
+++ b/data/grid5000/sites/toulouse/toulouse.json
@@ -0,0 +1,94 @@
+{
+  "compilation_server": false,
+  "description": "Grid5000 Toulouse site",
+  "email_contact": "support-staff@lists.grid5000.fr",
+  "frontend_ip": "172.16.127.110",
+  "g5ksubnet": {
+    "gateway": "10.163.255.254",
+    "network": "10.160.0.0/14"
+  },
+  "ipv6": {
+    "prefix": "2001:660:4406:900::/56",
+    "site_global_kavlan": 17,
+    "site_index": 9
+  },
+  "kavlan_ip_range": "10.28.0.0/14",
+  "kavlans": {
+    "1": {
+      "gateway": "192.168.207.254",
+      "network": "192.168.192.0/20",
+      "network_ipv6": "2001:660:4406:980::/64"
+    },
+    "17": {
+      "gateway": "10.31.255.254",
+      "gateway_ipv6": "2001:660:4406:9a0:900:0:ffff:ffff",
+      "network": "10.31.192.0/18",
+      "network_ipv6": "2001:660:4406:9a0::/64"
+    },
+    "2": {
+      "gateway": "192.168.223.254",
+      "network": "192.168.208.0/20",
+      "network_ipv6": "2001:660:4406:981::/64"
+    },
+    "3": {
+      "gateway": "192.168.239.254",
+      "network": "192.168.224.0/20",
+      "network_ipv6": "2001:660:4406:982::/64"
+    },
+    "4": {
+      "gateway": "10.28.63.254",
+      "gateway_ipv6": "2001:660:4406:990::ffff:ffff",
+      "network": "10.28.0.0/18",
+      "network_ipv6": "2001:660:4406:990::/64"
+    },
+    "5": {
+      "gateway": "10.28.127.254",
+      "gateway_ipv6": "2001:660:4406:991::ffff:ffff",
+      "network": "10.28.64.0/18",
+      "network_ipv6": "2001:660:4406:991::/64"
+    },
+    "6": {
+      "gateway": "10.28.191.254",
+      "gateway_ipv6": "2001:660:4406:992::ffff:ffff",
+      "network": "10.28.128.0/18",
+      "network_ipv6": "2001:660:4406:992::/64"
+    },
+    "7": {
+      "gateway": "10.28.255.254",
+      "gateway_ipv6": "2001:660:4406:993::ffff:ffff",
+      "network": "10.28.192.0/18",
+      "network_ipv6": "2001:660:4406:993::/64"
+    },
+    "8": {
+      "gateway": "10.29.63.254",
+      "gateway_ipv6": "2001:660:4406:994::ffff:ffff",
+      "network": "10.29.0.0/18",
+      "network_ipv6": "2001:660:4406:994::/64"
+    },
+    "9": {
+      "gateway": "10.29.127.254",
+      "gateway_ipv6": "2001:660:4406:995::ffff:ffff",
+      "network": "10.29.64.0/18",
+      "network_ipv6": "2001:660:4406:995::/64"
+    },
+    "default": {
+      "gateway": "172.16.127.254",
+      "gateway_ipv6": "2001:660:4406:900::ffff:ffff",
+      "network": "172.16.112.0/20",
+      "network_ipv6": "2001:660:4406:900::/64"
+    }
+  },
+  "latitude": 43.604,
+  "location": "Toulouse, France",
+  "longitude": 1.44305,
+  "name": "Toulouse",
+  "production": true,
+  "renater_ip": "192.168.4.16",
+  "security_contact": "support-staff@lists.grid5000.fr",
+  "sys_admin_contact": "support-staff@lists.grid5000.fr",
+  "type": "site",
+  "uid": "toulouse",
+  "user_support_contact": "support-staff@lists.grid5000.fr",
+  "virt_ip_range": "10.160.0.0/14",
+  "web": "http://www.grid5000.fr/w/Toulouse:Home"
+}
\ No newline at end of file
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 31abf609ab87c49920ca79f3fb73da7036a43bb2..3241ecfc3af8959977ffe71ebf20e88432ba9e24 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -64,6 +64,7 @@ disk_vendor_model_mapping:
       - HITACHI HUA7250S
     HP:
       - VB0250EAVER
+      - HPE P40498-B21
     Micron:
       - MTFDDAK480TDN
       - MTFDDAK960TDN
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index ee039b59350e3c1d8ccead8d549d398a5db833ae..235be02d8e7d12e9959ec0ab769353be0eca6c5d 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -7,6 +7,7 @@ ipv4:
       lyon 0 0 48 0
       nancy 0 0 64 0
       rennes 0 0 96 0
+      toulouse 0 0 112 0
       sophia 0 0 128 0
       luxembourg 0 0 176 0
       nantes 0 0 192 0
@@ -73,3 +74,4 @@ ipv4:
       rennes parasilo eth0 0 0 1 0
       rennes parasilo eth1 0 0 1 100
       sophia uvb eth0 0 0 4 0
+      toulouse montcalm eth0 0 0 8 0
diff --git a/input/grid5000/ipv6.yaml b/input/grid5000/ipv6.yaml
index 511d3bcc0b1566babf7a74d45e415ec6b938db1d..3dc5dc9f0de09af171c33785d4cdbd83280df79d 100644
--- a/input/grid5000/ipv6.yaml
+++ b/input/grid5000/ipv6.yaml
@@ -10,6 +10,7 @@ ipv6:
     nantes: 6
     rennes: 7
     sophia: 8
+    toulouse: 9
   site_global_kavlans:
     grenoble: 11
     lille: 12
@@ -18,4 +19,5 @@ ipv6:
     nancy: 14
     nantes: 21
     rennes: 16
+    toulouse: 17
     sophia: 18
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..67aa8ba5206b7cc3043ca3eb3eeb80573dbfb864
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
@@ -0,0 +1,84 @@
+model: HPE Proliant DL360 Gen10+
+created_at: 2022-12-01
+kavlan: false
+boot_type: uefi
+exotic: false
+queues:
+  - admin
+nodes:
+  montcalm-[1-9]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    architecture:
+      nb_procs: 2
+      nb_cores: 16
+      nb_threads: 64
+      platform_type: x86_64
+      cpu_core_numbering: contiguous
+    bios:
+      release_date: 01/01/2000
+      vendor: Unknown
+      version: Unknown
+    bmc_version: Unknown
+    chassis:
+      manufacturer: HPe
+      name: HPE Proliant DL360 Gen10+
+    main_memory:
+      ram_size: 549755813888
+    memory_devices:
+      dimm_a0:
+        size: 1024
+        technology: dram
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        management: true
+        enabled: true
+        mountable: false
+        mounted: false 
+      eth0:
+        interface: Ethernet
+        rate: 10000000000
+        management: false
+        name: ens10f0np0
+        vendor: Broadcom Inc. and subsidiaries
+        model: BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
+        driver: bnxt_en
+        enabled: true
+        mountable: true
+        mounted: true
+        bridged: false
+    operating_system:
+      cstate_driver: none
+      cstate_governor: menu
+      ht_enabled: true
+      pstate_driver: acpi-cpufreq
+      pstate_governor: performance
+      turboboost_enabled: true
+    processor:
+      microarchitecture: Ice Lake
+      clock_speed: 3400000000
+      cache_l1d: 98304
+      cache_l1i: 65536
+      cache_l2: 2621440
+      cache_l3: 3145728
+      ht_capable: true
+      instruction_set: x86-64
+      microcode: Unknown
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz
+      vendor: Intel
+      version: Silver 4314
+    storage_devices:
+      pci-0000:00:17.0-ata-1:
+        size: 1030792151040
+        id: disk0
+        model: HPE P40498-B21
+        interface: SATA
+        storage: SSD
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: ipmitool
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ef77dc101f14a441dd27b4c93e7d82e20092e71c
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.yaml
@@ -0,0 +1,9 @@
+---
+montcalm-1:
+  network_adapters:
+    bmc:
+      ip: 172.17.120.1
+      mac: 5c:ed:8c:3b:14:8a
+    eth0:
+      ip: 172.16.120.1
+      mac: 84:16:0c:4b:9b:36
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0b7fb56bb51a11481091716ad875c057298ecb90
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.yaml
@@ -0,0 +1,9 @@
+---
+montcalm-2:
+  network_adapters:
+    bmc:
+      ip: 172.17.120.2
+      mac: 5c:ed:8c:3b:d1:88
+    eth0:
+      ip: 172.16.120.2
+      mac: 84:16:0c:4a:29:04
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..488c56c212acde42559e36541b462453a3d33339
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.yaml
@@ -0,0 +1,9 @@
+---
+montcalm-3:
+  network_adapters:
+    bmc:
+      ip: 172.17.120.3
+      mac: 5c:ed:8c:3b:14:44
+    eth0:
+      ip: 172.16.120.3
+      mac: 84:16:0c:4b:fe:6c
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..189826f080af7b7a9276ffd4c0a67608412ea79b
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.yaml
@@ -0,0 +1,9 @@
+---
+montcalm-4:
+  network_adapters:
+    bmc:
+      ip: 172.17.120.4
+      mac: 5c:ed:8c:3b:14:94
+    eth0:
+      ip: 172.16.120.4
+      mac: 84:16:0c:4b:de:14
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5bc9ec2f8de1972bd4f525fc632368c0123aa7f8
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.yaml
@@ -0,0 +1,9 @@
+---
+montcalm-5:
+  network_adapters:
+    bmc:
+      ip: 172.17.120.5
+      mac: 5c:ed:8c:3b:14:e8
+    eth0:
+      ip: 172.16.120.5
+      mac: 84:16:0c:4b:1a:ae
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9209a805d909472c88f680fb52f383280d17e661
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.yaml
@@ -0,0 +1,9 @@
+---
+montcalm-6:
+  network_adapters:
+    bmc:
+      ip: 172.17.120.6
+      mac: 5c:ed:8c:3b:14:f0
+    eth0:
+      ip: 172.16.120.6
+      mac: 84:16:0c:4b:cd:8e
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9c6cda7f930a5be8f1a0ef492998429df0487e89
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.yaml
@@ -0,0 +1,9 @@
+---
+montcalm-7:
+  network_adapters:
+    bmc:
+      ip: 172.17.120.7
+      mac: 5c:ed:8c:3b:14:16
+    eth0:
+      ip: 172.16.120.7
+      mac: 84:16:0c:4b:c1:88
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3d94bbb400b90ea0551f4661bccc140b02488877
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.yaml
@@ -0,0 +1,9 @@
+---
+montcalm-8:
+  network_adapters:
+    bmc:
+      ip: 172.17.120.8
+      mac: 5c:ed:8c:3b:14:ec
+    eth0:
+      ip: 172.16.120.8
+      mac: 84:16:0c:4b:cd:46
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..773d98335b9ccd9af4f5316c67853c91904c0a05
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.yaml
@@ -0,0 +1,9 @@
+---
+montcalm-9:
+  network_adapters:
+    bmc:
+      ip: 172.17.120.9
+      mac: 5c:ed:8c:3b:d1:8a
+    eth0:
+      ip: 172.16.120.9
+      mac: 84:16:0c:4b:2e:28
diff --git a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..85fd2ab95d59e64ed80745a7b920c8c98feece7e
--- /dev/null
+++ b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
@@ -0,0 +1,93 @@
+---
+gw-toulouse:
+  model: Temporary-Dell-OS6
+  serial: unknown
+  ip: 172.17.127.254
+  kind: router
+  site: toulouse
+  snmp_community: Unknown
+  vlans:
+    "vlan100":
+      administrative: yes
+      addresses:
+        - 172.16.127.254
+    "vlan101":
+      addresses:
+        - 172.17.127.254
+    "vlan500":
+      addresses:
+        - 192.168.4.16
+    "vlan701":
+      name: kavlan-1
+      addresses:
+        - 192.168.192.0/20
+    "vlan702":
+      name: kavlan-2
+      addresses:
+        - 192.168.208.0/20
+    "vlan703":
+      name: kavlan-3
+      addresses:
+        - 192.168.224.0/20
+    "vlan704":
+      name: kavlan-4
+      addresses:
+        - 10.28.0.0/18
+    "vlan705":
+      name: kavlan-5
+      addresses:
+        - 10.28.64.0/18
+    "vlan706":
+      name: kavlan-6
+      addresses:
+        - 10.28.128.0/18
+    "vlan707":
+      name: kavlan-7
+      addresses:
+        - 10.28.192.0/18
+    "vlan708":
+      name: kavlan-8
+      addresses:
+        - 10.29.0.0/18
+    "vlan709":
+      name: kavlan-9
+      addresses:
+        - 10.29.64.0/18
+    "vlan712":
+      name: kavlan-17
+      addresses:
+        - 10.31.192.0/18
+  linecards:
+    1:
+      rate: 10000000000
+      snmp_pattern: "tengigabitethernet1/%LINECARD%/%PORT%"
+      kavlan_pattern: "%PORT%"
+      kind: node
+      ports:
+        1: montcalm-1
+        2: montcalm-2
+        3: montcalm-3
+        4: montcalm-4
+        5: montcalm-5
+        6: montcalm-6
+        7: montcalm-7
+        8: montcalm-8
+        9: montcalm-9
+        15:
+          uid: oobm
+          kind: server
+        16:
+          uid: oobm
+          kind: server
+        17:
+          uid: pve-1
+          kind: server
+        18:
+          uid: pve-2
+          kind: server
+        19:
+          uid: nfs
+          kind: server
+        20:
+          uid: nfs
+          kind: server
diff --git a/input/grid5000/sites/toulouse/pdus.yaml b/input/grid5000/sites/toulouse/pdus.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1a0646f5c19117eb61087ffc1735032c6203896e
--- /dev/null
+++ b/input/grid5000/sites/toulouse/pdus.yaml
@@ -0,0 +1,12 @@
+---
+pdus:
+  epdu-d:
+    vendor: eaton
+    model: unknown
+    ip: 172.17.127.4
+    mac: 00:20:85:d7:9f:ea
+  epdu-g:
+    vendor: eaton
+    model: unknown
+    ip: 172.17.127.5
+    mac: 00:20:85:d7:9f:ef
diff --git a/input/grid5000/sites/toulouse/servers/physical.yaml b/input/grid5000/sites/toulouse/servers/physical.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..20867a2c7b5a35552965ca1813053adf31d9bec2
--- /dev/null
+++ b/input/grid5000/sites/toulouse/servers/physical.yaml
@@ -0,0 +1,49 @@
+---
+pve-1:
+  kind: physical
+  serial: CZJ2170NK8
+  alias: [ntp]
+  network_adapters:
+    bmc:
+      ip: 172.17.126.1
+      mac: 5c:ba:2c:ae:5f:50
+    default:
+      ip: 172.16.127.1
+      mac: d4:f5:ef:56:04:c0
+    adm:
+      ip: 172.17.127.1
+
+pve-2:
+  kind: physical
+  serial: CZJ2170NK9
+  network_adapters:
+    bmc:
+      ip: 172.17.126.2
+      mac: 5c:ba:2c:4e:5f:5e
+    default:
+      ip: 172.16.127.2
+      mac: d4:f5:ef:56:04:c0
+    adm:
+      ip: 172.17.127.2
+
+srv-data:
+  kind: physical
+  serial: CZ22230FL8
+  alias: [nfs, home-g5k, modules]
+  network_adapters:
+    bmc:
+      ip: 172.17.126.3
+      mac: 5c:ba:2c:29:08:1a
+    default:
+      ip: 172.16.127.3
+      mac: d4:f5:ef:32:2a:40
+    adm:
+      ip: 172.17.127.3
+
+oobm:
+  kind: physical
+  alias: [x-bmc]
+  network_adapters:
+    default:
+      ip: 172.17.121.1
+      mac: 00:30:64:37:c8:c8
diff --git a/input/grid5000/sites/toulouse/servers/virtual.yaml b/input/grid5000/sites/toulouse/servers/virtual.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8eb13570bbcf031c847cc360e7f21dfd423e4861
--- /dev/null
+++ b/input/grid5000/sites/toulouse/servers/virtual.yaml
@@ -0,0 +1,142 @@
+supervision2:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.103
+syslog:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.104
+mail:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.105
+ldap:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.106
+dns:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.107
+puppet6:
+  kind: virtual
+  alias:
+    - puppet
+  network_adapters:
+    default:
+      ip: 172.16.127.108
+dhcp:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.109
+
+ftoulouse:
+  kind: virtual
+  alias:
+    - oar-api
+    - frontend
+  network_adapters:
+    default:
+      ip: 172.16.127.110
+
+kadeploy:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.111
+
+api-server-v3:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.112
+
+conman:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.113
+
+api-server-devel:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.114
+
+api-proxy:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.115
+
+oar:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.116
+
+kavlan:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.117
+
+kavlan-1:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.118
+
+kavlan-2:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.119
+
+kavlan-3:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.120
+
+kadeploy-devel:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.121
+
+oxidized:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.122
+
+guix:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.123
+
+kwollect:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.124
+
+kavlan-agent:
+  kind: virtual
+  network_adapters:
+    default:
+      ip: 172.16.127.125
+nat:
+  kind: virtual
+  alias: [access]
+  network_adapters:
+    default:
+      ip: 172.16.127.200
diff --git a/input/grid5000/sites/toulouse/toulouse.yaml b/input/grid5000/sites/toulouse/toulouse.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..47ed81607c3b23dace1231e80063f70b5439d4cc
--- /dev/null
+++ b/input/grid5000/sites/toulouse/toulouse.yaml
@@ -0,0 +1,66 @@
+---
+name: Toulouse
+location: Toulouse, France
+web: http://www.grid5000.fr/w/Toulouse:Home
+description: Grid5000 Toulouse site
+latitude: 43.604
+longitude: 1.44305
+email_contact: support-staff@lists.grid5000.fr
+sys_admin_contact: support-staff@lists.grid5000.fr
+security_contact: support-staff@lists.grid5000.fr
+user_support_contact: support-staff@lists.grid5000.fr
+compilation_server: false
+kavlan_ip_range: 10.28.0.0/14
+virt_ip_range: 10.160.0.0/14
+renater_ip: 192.168.4.16
+production: true
+frontend_ip: 172.16.127.110
+
+g5ksubnet:
+  network: 10.160.0.0/14
+  gateway: 10.163.255.254
+
+kavlans:
+  default:
+    network: 172.16.112.0/20
+    gateway: 172.16.127.254
+
+  1:
+    network: 192.168.192.0/20
+    gateway: 192.168.207.254
+
+  2:
+    network: 192.168.208.0/20
+    gateway: 192.168.223.254
+
+  3:
+    network: 192.168.224.0/20
+    gateway: 192.168.239.254
+
+  4:
+    network: 10.28.0.0/18
+    gateway: 10.28.63.254
+
+  5:
+    network: 10.28.64.0/18
+    gateway: 10.28.127.254
+
+  6:
+    network: 10.28.128.0/18
+    gateway: 10.28.191.254
+
+  7:
+    network: 10.28.192.0/18
+    gateway: 10.28.255.254
+
+  8:
+    network: 10.29.0.0/18
+    gateway: 10.29.63.254
+
+  9:
+    network: 10.29.64.0/18
+    gateway: 10.29.127.254
+
+  17:
+    network: 10.31.192.0/18
+    gateway: 10.31.255.254
diff --git a/lib/refrepo/gen/puppet/bindg5k.rb b/lib/refrepo/gen/puppet/bindg5k.rb
index 0b770c1a6c42413ba30b36c95c9c5bcddc2bbaa4..60a7c29fd5d349c4de583608a0d3ed715266b40a 100644
--- a/lib/refrepo/gen/puppet/bindg5k.rb
+++ b/lib/refrepo/gen/puppet/bindg5k.rb
@@ -719,7 +719,7 @@ def generate_internal_site_data(site_uid, site, dest_dir, zones_dir)
       next if not File::file?(path)
       next if path =~ /manual/ # skip *manual* files
       # FIXME those files are not named *manual*, but should not be removed
-      next if ['nancy-laptops.db', 'toulouse-servers.db', 'toulouse.db'].include?(File::basename(path))
+      next if ['nancy-laptops.db'].include?(File::basename(path))
       FileUtils::rm(path)
     end
   end
@@ -875,7 +875,6 @@ def generate_puppet_bindg5k(options)
 
   # Loop over Grid'5000 sites
   refapi["sites"].each { |site_uid, site|
-
     next unless $options[:sites].include?(site_uid)
 
     internal_dest_dir = "#{$options[:output_dir]}/platforms/production/modules/generated/files/bind/"
diff --git a/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb b/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
index d4073e943face0090498808f07a2b245903ef180..165a39377452c323864922ad2520062535c913f2 100644
--- a/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
+++ b/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
@@ -107,7 +107,7 @@ refapi['sites'].sort.to_h.each_key do |site|
 
              if not interface['mac'] or
                 not node['kavlan'][interface['device']]["kavlan-#{kavlan_id}"]
-                  warn "WARN: Cannot fill dhcpd entry for #{node_uid}, interface #{interface_uid} in vlan #{kavlan_id}: " \
+                  warn "WARN: Cannot fill dhcpd entry for #{node_uid}, interface #{interface['name']} in vlan #{kavlan_id}: " \
               "Missing mac (#{interface['mac']}) or IP (#{node['kavlan'][interface['device']] and node['kavlan'][interface['device']]["kavlan-#{kavlan_id}"]})"
                   next
              end
diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index 1b7288b2da6ed20dcab4409eac628c50d67e7338..c2981f5345223b339cf6c226abe042247ce10cb3 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -356,6 +356,7 @@ class G5KHardwareGenerator < WikiGenerator
       'Zen 2' => '2019',
       'Cascade Lake-SP' => '2019',
       'Vulcan' => '2018',
+      'Ice Lake' => '2021',
     }
     date = release_dates[microarchitecture]
     raise "ERROR: microarchitecture not found: '#{microarchitecture}'. Add in hardware.rb" if date.nil?
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index d3c0e66be7ab7a864c079217fb3f2606f3abf5a7..e9ff1d30ba2f61d11fdb5b403a4bb96add82ec77 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -684,6 +684,8 @@ def get_flops_per_cycle(microarch, cpu_name)
     return 8
   when "Haswell", "Broadwell", "Zen 2"
     return 16
+  when "Ice Lake"
+    return 32
   when "Cascade Lake-SP", "Skylake"
     case cpu_name
     when /Silver 4110/, /Gold 5218/, /Gold 5220/