diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
new file mode 100644
index 0000000000000000000000000000000000000000..276e0b6816520bfae9225c81ea5836ae302d467d
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
@@ -0,0 +1,22 @@
+{
+  "boot_type": "uefi",
+  "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+  "exotic": true,
+  "kavlan": false,
+  "manufactured_at": "1970-01-01",
+  "metrics": [
+
+  ],
+  "model": "Switch P4",
+  "nodes_count": 8,
+  "nodes_description": "1 CPU Intel(R) Pentium(R) D1517, 4 cores/CPU, 8GB RAM, 119GB SSD, 1 x 1Gb Ethernet",
+  "priority": 197001,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "engelbourg",
+  "warranty_end": "1970-01-01"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..975095785617b2d70a21e8839aa445be6f389d95
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -0,0 +1,136 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "unknown",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "wedge",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.1",
+      "ip6": "2001:660:4406:a00:2::1",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:7a",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-1.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet31",
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.161.1",
+      "kavlan": false,
+      "mac": "01:01:01:01:01:01",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "engelbourg-1-bmc.strasbourg.grid5000.fr"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025040409",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..49dbeec4ba93166a2bf7659f33580ce1162b7fc2
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -0,0 +1,136 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "unknown",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "wedge",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.2",
+      "ip6": "2001:660:4406:a00:2::2",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:12",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-2.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet13",
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.161.2",
+      "kavlan": false,
+      "mac": "e0:01:a6:a4:4c:fc",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "engelbourg-2-bmc.strasbourg.grid5000.fr"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025040409",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..181727d9ae6022b224a3ae97a953683d561f6dd0
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -0,0 +1,136 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "unknown",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "wedge",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.3",
+      "ip6": "2001:660:4406:a00:2::3",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:39",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-3.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet14",
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.161.3",
+      "kavlan": false,
+      "mac": "e0:01:a6:a4:3a:f0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "engelbourg-3-bmc.strasbourg.grid5000.fr"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025040409",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..352e9f03b069d1b686df80f77b490bbd32cefb8c
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -0,0 +1,136 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "unknown",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "wedge",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.4",
+      "ip6": "2001:660:4406:a00:2::4",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0e:d7",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-4.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet15",
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.161.4",
+      "kavlan": false,
+      "mac": "e0:01:a6:a4:36:04",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "engelbourg-4-bmc.strasbourg.grid5000.fr"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025040409",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
new file mode 100644
index 0000000000000000000000000000000000000000..31ab491e870fa4bd4e7331b8767968d8a4d0e675
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -0,0 +1,136 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "unknown",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "wedge",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.5",
+      "ip6": "2001:660:4406:a00:2::5",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:42",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-5.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet16",
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.161.5",
+      "kavlan": false,
+      "mac": "e0:01:a6:a4:3c:08",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "engelbourg-5-bmc.strasbourg.grid5000.fr"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025040409",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-5"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..b80d48c614ef2aef2bdd93f8506d29b3f35489d9
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -0,0 +1,136 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "unknown",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "wedge",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.6",
+      "ip6": "2001:660:4406:a00:2::6",
+      "kavlan": false,
+      "mac": "00:90:fb:76:cd:89",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-6.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet17",
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.161.6",
+      "kavlan": false,
+      "mac": "e0:01:a6:a4:4b:e4",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "engelbourg-6-bmc.strasbourg.grid5000.fr"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025040409",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-6"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
new file mode 100644
index 0000000000000000000000000000000000000000..45ffed860df33d032829ffaced66ea586961574e
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -0,0 +1,136 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "unknown",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "wedge",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.7",
+      "ip6": "2001:660:4406:a00:2::7",
+      "kavlan": false,
+      "mac": "00:90:fb:76:cd:8a",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-7.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet18",
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.161.7",
+      "kavlan": false,
+      "mac": "e0:01:a6:a4:49:28",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "engelbourg-7-bmc.strasbourg.grid5000.fr"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025040409",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-7"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
new file mode 100644
index 0000000000000000000000000000000000000000..2b08a2efe2c859f745218423754d604409772225
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -0,0 +1,136 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 4,
+    "nb_procs": 1,
+    "nb_threads": 8,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/08/2021",
+    "vendor": "American Megatrends Inc.",
+    "version": "R1.00.E4"
+  },
+  "bmc_version": "unknown",
+  "chassis": {
+    "manufactured_at": "1970-01-01",
+    "manufacturer": "Default string",
+    "name": "Default string",
+    "serial": "Default string",
+    "warranty_end": "1970-01-01"
+  },
+  "exotic": true,
+  "main_memory": {
+    "ram_size": 8589934592
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "wedge",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "sodimm_a1",
+      "size": 8589934592,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "3.16.0",
+      "interface": "Ethernet",
+      "ip": "172.16.161.8",
+      "ip6": "2001:660:4406:a00:2::8",
+      "kavlan": false,
+      "mac": "00:90:fb:78:0f:38",
+      "management": false,
+      "model": "I210 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp2s0",
+      "network_address": "engelbourg-8.strasbourg.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet19",
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.161.8",
+      "kavlan": false,
+      "mac": "e0:01:a6:a4:3b:7c",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "engelbourg-8-bmc.strasbourg.grid5000.fr"
+    }
+  ],
+  "nodeset": "engelbourg",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": false
+  },
+  "performance": {
+    "core_flops": 25600000000,
+    "node_flops": 102400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 6291456,
+    "clock_speed": 1600000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0x700001c",
+    "model": "Intel(R) Pentium(R)",
+    "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+    "vendor": "Intel",
+    "version": "D1517"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025040409",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+      "firmware_version": "L17606",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "M.2 (S80) 3ME4",
+      "size": 128035676160,
+      "storage": "SSD",
+      "vendor": "Innodisk"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "engelbourg-8"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index 9350b0064d319df429869c3d6094fbd6f1be8bfc..29b815353e502cedd8d047fc2b7c6be35f6e0b52 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet6",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet8",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index 933ac0b0811819e72728fb6a8a051726e340ad7e..ab52ddcfc09462b44655371b29657acbf83d9159 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet33",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet35",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index 297045d3cb98aecf9e4caeb755662ef1e110b356..26007adafad19900d68eb0d340ccc7fcfe65614e 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet9",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet11",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index 206582cc4abb0b33d9fefcce09a7e6170ab38e71..0754b4f09835d5bdc64910afc982eafcd713a244 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet12",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet14",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index bbf937171b7f2843493a6f7ff5de58994cee8393..878601d08e8da3fc845ea2249958dbdaeed5d7f4 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet15",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet17",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index b42a2f4a6224dfc0ce9bc1abfe3e4f5861f2034c..a478f83f2ee94e704bb8be115818efb177c4ff88 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet18",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet20",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index c9ff4c344ae4a6a6db909a562e79bda3c11c9e4f..5709591f577a872724f7cebae3af500b15553b28 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet21",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet23",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index b1f9310388bce004429f6dd1843c6d5a4e510cde..9c907ab7b34fe694e74a8483d93e3bb04a933c2e 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet24",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet26",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index c4a72445462671a7e08ef1eec48513df60fa776d..a024a407a271c147e4f43e0b42d1ca484562f17e 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet27",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet29",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index 9435f999f5c7a3d60888df8c265bc7c36fe3adfa..ad24ec09b8c4ec98cecc48970aa085564fae44fb 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -131,7 +131,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 128,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet30",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "gw",
+      "switch": "sw-core",
       "switch_port": "Ethernet32",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/strasbourg/network_equipments/gw.json b/data/grid5000/sites/strasbourg/network_equipments/gw.json
index 2e8e0b056b26f93de3bce3dbe8882dc5ef0438cd..054872116d9193cae63139da24f918341456e702 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/gw.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/gw.json
@@ -2,14 +2,6 @@
   "alias": [
     "gw-strasbourg"
   ],
-  "channels": {
-    "port-channel1": {
-      "kind": "server",
-      "port": "port-channel1",
-      "rate": 50000000000,
-      "uid": "srv-data"
-    }
-  },
   "ip": "172.16.175.254",
   "ip6": "2001:660:4406:a00::ffff:ffff",
   "kind": "router",
@@ -21,177 +13,94 @@
       "kind": "node",
       "ports": [
         {
-          "kind": "channel",
+          "kind": "other",
           "snmp_name": "Ethernet0",
-          "uid": "port-channel1"
+          "uid": "dev-strasbourg"
         },
         {
-          "kind": "channel",
+          "kind": "other",
           "snmp_name": "Ethernet1",
-          "uid": "port-channel1"
+          "uid": "dev-apornet"
         },
         {
-          "kind": "server",
+          "kind": "other",
           "snmp_name": "Ethernet2",
-          "uid": "pve-1"
+          "uid": "stonet-1"
         },
         {
-          "kind": "server",
+          "kind": "other",
           "snmp_name": "Ethernet3",
-          "uid": "pve-2"
+          "uid": "ibat-1"
         },
         {
+          "kind": "other",
+          "snmp_name": "Ethernet4",
+          "uid": "wiki-net"
         },
         {
+          "kind": "other",
+          "snmp_name": "Ethernet5",
+          "uid": "strasbourg"
         },
         {
-          "kind": "node",
-          "port": "eth0",
+          "kind": "other",
           "snmp_name": "Ethernet6",
-          "uid": "fleckenstein-1"
+          "uid": "dev-www"
         },
         {
+          "kind": "other",
+          "snmp_name": "Ethernet7",
+          "uid": "soknet-1"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet8",
-          "uid": "fleckenstein-1"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet9",
-          "uid": "fleckenstein-2"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet11",
-          "uid": "fleckenstein-2"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet12",
-          "uid": "fleckenstein-3"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet14",
-          "uid": "fleckenstein-3"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet15",
-          "uid": "fleckenstein-4"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet17",
-          "uid": "fleckenstein-4"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet18",
-          "uid": "fleckenstein-5"
         },
         {
+          "kind": "other",
+          "snmp_name": "Ethernet19",
+          "uid": "PE-RENATER"
         },
         {
-          "kind": "node",
-          "port": "eth2",
+          "kind": "other",
           "snmp_name": "Ethernet20",
-          "uid": "fleckenstein-5"
+          "uid": "sw-core-oob"
         },
         {
-          "kind": "node",
-          "port": "eth0",
+          "kind": "switch",
           "snmp_name": "Ethernet21",
-          "uid": "fleckenstein-6"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet23",
-          "uid": "fleckenstein-6"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet24",
-          "uid": "fleckenstein-7"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet26",
-          "uid": "fleckenstein-7"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet27",
-          "uid": "fleckenstein-8"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet29",
-          "uid": "fleckenstein-8"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet30",
-          "uid": "fleckenstein-9"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet32",
-          "uid": "fleckenstein-9"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet33",
-          "uid": "fleckenstein-10"
-        },
-        {
+          "uid": "sw-core"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet35",
-          "uid": "fleckenstein-10"
+          "kind": "other",
+          "snmp_name": "Ethernet22",
+          "uid": "pfsense-icube"
         }
       ],
-      "rate": 25000000000,
+      "rate": 10000000000,
       "snmp_pattern": "Ethernet%PORT%"
     }
   ],
   "managed_by_us": true,
-  "model": "wedge100bf_32x",
-  "serial": "AM26029251",
+  "model": "Juniper EX4600-40F",
   "site": "strasbourg",
   "snmp_community": "Unknown",
   "type": "network_equipment",
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
new file mode 100644
index 0000000000000000000000000000000000000000..bdcd3a5225ec6043d335e538d7c83dcd76c2d371
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -0,0 +1,224 @@
+{
+  "ip": "172.16.175.253",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%PORT%",
+      "kind": "other",
+      "ports": [
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet0",
+          "uid": "srv-data-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet1",
+          "uid": "pve-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet2",
+          "uid": "pve-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet3",
+          "uid": "fleckenstein-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet4",
+          "uid": "fleckenstein-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet5",
+          "uid": "fleckenstein-3-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet6",
+          "uid": "fleckenstein-4-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet7",
+          "uid": "fleckenstein-5-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet8",
+          "uid": "fleckenstein-6-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet9",
+          "uid": "fleckenstein-7-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet10",
+          "uid": "fleckenstein-8-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet11",
+          "uid": "fleckenstein-9-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet12",
+          "uid": "fleckenstein-10-bmc"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet13",
+          "uid": "engelbourg-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet14",
+          "uid": "engelbourg-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet15",
+          "uid": "engelbourg-4"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet16",
+          "uid": "engelbourg-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet17",
+          "uid": "engelbourg-6"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet18",
+          "uid": "engelbourg-7"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet19",
+          "uid": "engelbourg-8"
+        },
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet21",
+          "uid": "sw-core-mgmt"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet22",
+          "uid": "iotlab-devstrasbourg-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet23",
+          "uid": "inetlab-devaportnet-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet24",
+          "uid": "inetlab-stonet-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet25",
+          "uid": "inetlab-ibat-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet26",
+          "uid": "inetlab-wikinet-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet27",
+          "uid": "inetlab-soknet-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet28",
+          "uid": "iotlab-strasbourg-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet29",
+          "uid": "iotlab-devwww-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "Ethernet30",
+          "uid": "iotlab-www-bmc"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet31",
+          "uid": "engelbourg-1"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "Ethernet48",
+          "uid": "sw-core"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "Ethernet%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "unknown",
+  "site": "strasbourg",
+  "snmp_community": "Unknown",
+  "type": "network_equipment",
+  "uid": "sw-admin"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
new file mode 100644
index 0000000000000000000000000000000000000000..74e56737e89e4695bf1a3e182a3ec2e965cb0e78
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -0,0 +1,381 @@
+{
+  "alias": [
+    "engelbourg-1"
+  ],
+  "channels": {
+    "port-channel1": {
+      "kind": "server",
+      "port": "port-channel1",
+      "rate": 50000000000,
+      "uid": "srv-data"
+    }
+  },
+  "ip": "172.16.175.252",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+          "kind": "channel",
+          "snmp_name": "Ethernet0",
+          "uid": "port-channel1"
+        },
+        {
+          "kind": "channel",
+          "snmp_name": "Ethernet1",
+          "uid": "port-channel1"
+        },
+        {
+          "kind": "server",
+          "snmp_name": "Ethernet2",
+          "uid": "pve-1"
+        },
+        {
+          "kind": "server",
+          "snmp_name": "Ethernet3",
+          "uid": "pve-2"
+        },
+        {
+        },
+        {
+          "kind": "router",
+          "snmp_name": "Ethernet5",
+          "uid": "gw"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet6",
+          "uid": "fleckenstein-1"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet8",
+          "uid": "fleckenstein-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet9",
+          "uid": "fleckenstein-2"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet11",
+          "uid": "fleckenstein-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet12",
+          "uid": "fleckenstein-3"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet14",
+          "uid": "fleckenstein-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet15",
+          "uid": "fleckenstein-4"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet17",
+          "uid": "fleckenstein-4"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet18",
+          "uid": "fleckenstein-5"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet20",
+          "uid": "fleckenstein-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet21",
+          "uid": "fleckenstein-6"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet23",
+          "uid": "fleckenstein-6"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet24",
+          "uid": "fleckenstein-7"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet26",
+          "uid": "fleckenstein-7"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet27",
+          "uid": "fleckenstein-8"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet29",
+          "uid": "fleckenstein-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet30",
+          "uid": "fleckenstein-9"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet32",
+          "uid": "fleckenstein-9"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet33",
+          "uid": "fleckenstein-10"
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet35",
+          "uid": "fleckenstein-10"
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "Ethernet36",
+          "uid": "sw-admin"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        }
+      ],
+      "rate": 25000000000,
+      "snmp_pattern": "Ethernet%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "wedge100bf_32x",
+  "site": "strasbourg",
+  "snmp_community": "Unknown",
+  "type": "network_equipment",
+  "uid": "sw-core"
+}
\ No newline at end of file
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index c8a47747f986d72cafd6ea2e483727233f793e10..4505010cdd010039893db3a4ddf56266479d3cc2 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -148,6 +148,8 @@ disk_vendor_model_mapping:
     Lenovo:
       - SSDSC2KG480GZL
       - ST4000NM000A
+    Innodisk:
+      - M.2 (S80) 3ME4
     Unknown:
       - unknown
     
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 7b8e3585d84289b8e7ce2c007dbc521f37b8957e..f132573b97399c737ba5d94954f57b37b6f38e7d 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -218,6 +218,7 @@ ipv4:
       strasbourg fleckenstein eth0 0 0 0 0
       strasbourg fleckenstein eth1 0 0 0 10
       strasbourg fleckenstein eth2 0 0 0 20
+      strasbourg engelbourg eth0 0 0 1 0
       toulouse montcalm eth0 0 0 8 0
       toulouse estats eth0 0 0 9 0
       louvain spirou eth0 0 0 0 0
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..742ec0c3e9aa2a04907800ac07201b7f1068399f
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
@@ -0,0 +1,43 @@
+---
+model: Switch P4
+created_at: 1970-01-01 # TODO: change this value
+kavlan: false
+boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice)
+exotic: true 
+queues:
+  - admin
+  - testing
+nodes:
+  engelbourg-[1-8]:
+    chassis:
+      manufactured_at: 1970-01-01 # TODO: Put date.
+      warranty_end: 1970-01-01 # TODO: Put date.
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Broadwell
+      clock_speed: 1600000000
+      model: Intel(R) Pentium(R)
+      version: D1517
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+    storage_devices:
+      pci-0000:00:1f.2-ata-1:
+        id: disk0
+        interface: SATA
+    software:
+      standard-environment: debian11-x64-std # TODO: check that architecture is OK
+    management_tools:
+      bmc_vendor_tool: wedge
+    nodeset: engelbourg # TODO: rename cluster
+
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0dc9b73735b174b0148477961bab0e631d434846
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
@@ -0,0 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-1:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: unknown
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.161.1
+      mac: 01:01:01:01:01:01 #FAKE VALUE
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.1
+      mac: 00:90:fb:78:0f:7a
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c48a85f676723d0863e28dc1ec355cda32cd968f
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
@@ -0,0 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-2:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: unknown
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.161.2
+      mac: E0:01:A6:A4:4C:FC
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.2
+      mac: 00:90:fb:78:0f:12
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..944a670d222280e916b9732615896b6385cf103f
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
@@ -0,0 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-3:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: unknown
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.161.3
+      mac: E0:01:A6:A4:3A:F0
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.3
+      mac: 00:90:fb:78:0f:39
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6e7f193c6ecc1bcc3b188c38620a2ddd4e919296
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
@@ -0,0 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-4:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: unknown
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.161.4
+      mac: E0:01:A6:A4:36:04
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.4
+      mac: 00:90:fb:78:0e:d7
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..57ab4a93ad905150c68366ee72e487c43af77f68
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
@@ -0,0 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-5:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: unknown
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.161.5
+      mac: E0:01:A6:A4:3C:08
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.5
+      mac: 00:90:fb:78:0f:42
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c613ada99d2042e65dc369b6f1ca0c12440a3f66
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
@@ -0,0 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-6:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: unknown
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.161.6
+      mac: E0:01:A6:A4:4B:E4
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.6
+      mac: 00:90:fb:76:cd:89
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..13dbe606d66d189a820de4cfc9bd638c6e409256
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
@@ -0,0 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-7:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: unknown
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.161.7
+      mac: E0:01:A6:A4:49:28
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.7
+      mac: 00:90:fb:76:cd:8a
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5890f6ccc02a0dbf3fbf9ed9027b2041a60229ba
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
@@ -0,0 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-8:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 4
+    nb_procs: 1
+    nb_threads: 8
+    platform_type: x86_64
+  bios:
+    release_date: 02/08/2021
+    vendor: American Megatrends Inc.
+    version: R1.00.E4
+  bmc_version: unknown
+  chassis:
+    manufacturer: Default string
+    name: Default string
+    serial: Default string
+  main_memory:
+    ram_size: 8589934592
+  memory_devices:
+    sodimm_a1:
+      size: 8589934592
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.161.8
+      mac: E0:01:A6:A4:3B:7C
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 3.16.0
+      interface: Ethernet
+      ip: 172.16.161.8
+      mac: 00:90:fb:78:0f:38
+      management: false
+      model: I210 Gigabit Network Connection
+      name: enp2s0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: false
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 6291456
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x700001c'
+    other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+    vendor: Intel
+  storage_devices:
+    pci-0000:00:1f.2-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+      firmware_version: L17606
+      model: M.2 (S80) 3ME4
+      size: 128035676160
+      storage: SSD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
index 4eb4fdf1864c3e28303974a226b748aa3e201fa3..0f5da55c9aa6b9ecf875255ab9850055b380ba08 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
@@ -1,7 +1,6 @@
 ---
 gw:
-  model: wedge100bf_32x
-  serial: AM26029251
+  model: Juniper EX4600-40F
   ip: 172.16.175.254
   ip6: 2001:660:4406:a00::ffff:ffff
   kind: router
@@ -63,56 +62,44 @@ gw:
         - 10.39.192.0/18
   linecards:
     1:
-      rate: 25000000000
+      rate: 10000000000
       snmp_pattern: "Ethernet%PORT%"
       kavlan_pattern: "%PORT%"
       kind: node
       ports:
-        0:
-          uid: port-channel1
-          kind: channel
-        1:
-          uid: port-channel1
-          kind: channel
-        2:
-          uid: pve-1
-          kind: server
+        0: 
+          uid: dev-strasbourg
+          kind: other
+        1: 
+          uid: dev-apornet
+          kind: other
+        2: 
+          uid: stonet-1
+          kind: other
         3:
-          uid: pve-2
-          kind: server
-        6: fleckenstein-1-eth0
-        7:
-        8: fleckenstein-1-eth2
-        9: fleckenstein-2-eth0
-        10:
-        11: fleckenstein-2-eth2
-        12: fleckenstein-3-eth0
-        13:
-        14: fleckenstein-3-eth2
-        15: fleckenstein-4-eth0
-        16:
-        17: fleckenstein-4-eth2
-        18: fleckenstein-5-eth0
-        19:
-        20: fleckenstein-5-eth2
-        21: fleckenstein-6-eth0
+          uid: ibat-1
+          kind: other
+        4: 
+          uid: wiki-net
+          kind: other
+        5:
+          uid: strasbourg
+          kind: other
+        6: 
+          uid: dev-www
+          kind: other
+        7: 
+          uid: soknet-1
+          kind: other
+        19: 
+          uid: PE-RENATER
+          kind: other
+        20:
+          uid: sw-core-oob
+          kind: other
+        21:
+          uid: sw-core
+          kind: switch
         22:
-        23: fleckenstein-6-eth2
-        24: fleckenstein-7-eth0
-        25:
-        26: fleckenstein-7-eth2
-        27: fleckenstein-8-eth0
-        28:
-        29: fleckenstein-8-eth2
-        30: fleckenstein-9-eth0
-        31:
-        32: fleckenstein-9-eth2
-        33: fleckenstein-10-eth0
-        34:
-        35: fleckenstein-10-eth2
-  channels:
-    port-channel1:
-      port: port-channel1
-      uid: srv-data
-      rate: 50000000000
-      kind: server
+          uid: pfsense-icube
+          kind: other
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c8c90a745c9fea2589ca3cc39a135679563e1be7
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -0,0 +1,68 @@
+---
+sw-admin:
+  model: unknown
+  ip: 172.16.175.253
+  kind: switch
+  managed_by_us: true
+  snmp_community: Unknown
+  site: strasbourg
+  linecards:
+    1:
+      rate: 1000000000
+      snmp_pattern: "Ethernet%PORT%"
+      kavlan_pattern: "%PORT%"
+      kind: other
+      ports:
+        0: srv-data-bmc
+        1: pve-1-bmc
+        2: pve-2-bmc
+        3: fleckenstein-1-bmc 
+        4: fleckenstein-2-bmc
+        5: fleckenstein-3-bmc
+        6: fleckenstein-4-bmc
+        7: fleckenstein-5-bmc
+        8: fleckenstein-6-bmc
+        9: fleckenstein-7-bmc 
+        10: fleckenstein-8-bmc 
+        11: fleckenstein-9-bmc 
+        12: fleckenstein-10-bmc 
+        13: 
+          uid: engelbourg-2
+          kind: node
+        14: 
+          uid: engelbourg-3 
+          kind: node
+        15: 
+          uid: engelbourg-4
+          kind: node 
+        16: 
+          uid: engelbourg-5
+          kind: node 
+        17: 
+          uid: engelbourg-6
+          kind: node 
+        18: 
+          uid: engelbourg-7
+          kind: node 
+        19: 
+          uid: engelbourg-8
+          kind: node 
+        # 20: 
+          # uid: ramstein-1
+          # kind: node
+        21: sw-core-mgmt
+        22: iotlab-devstrasbourg-bmc
+        23: inetlab-devaportnet-bmc
+        24: inetlab-stonet-bmc
+        25: inetlab-ibat-bmc
+        26: inetlab-wikinet-bmc
+        27: inetlab-soknet-bmc
+        28: iotlab-strasbourg-bmc
+        29: iotlab-devwww-bmc
+        30: iotlab-www-bmc
+        31: 
+          uid: engelbourg-1 # Fake entry
+          kind: node
+        48: 
+          uid: sw-core
+          kind: switch
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..eb9e42d11776e17d045f018091020c335539da44
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -0,0 +1,98 @@
+---
+sw-core:
+  model: wedge100bf_32x
+  ip: 172.16.175.252
+  #TODO
+  #ip6: 2001:660:4406:a00::ffff:ffff
+  kind: switch
+  managed_by_us: true
+  snmp_community: Unknown
+  alias:
+    - engelbourg-1
+  site: strasbourg
+  linecards: 
+    1:
+      rate: 25000000000
+      snmp_pattern: "Ethernet%PORT%"
+      kavlan_pattern: "%PORT%"
+      kind: node
+      ports:
+        0:
+          uid: port-channel1
+          kind: channel
+        1:
+          uid: port-channel1
+          kind: channel 
+        2:
+          uid: pve-1
+          kind: server
+        3:
+          uid: pve-2
+          kind: server
+#       4: inetlab-sw1-eth0
+        5: 
+          uid: gw
+          kind: router
+        6: fleckenstein-1-eth0
+#       7: fleckenstein-1-eth1
+        8: fleckenstein-1-eth2
+        9: fleckenstein-2-eth0
+#       10: fleckenstein-2-eth1
+        11: fleckenstein-2-eth2
+        12: fleckenstein-3-eth0
+#       13: fleckenstein-3-eth1
+        14: fleckenstein-3-eth2
+        15: fleckenstein-4-eth0
+#       16: fleckenstein-4-eth1
+        17: fleckenstein-4-eth2
+        18: fleckenstein-5-eth0
+#       19: fleckenstein-5-eth1
+        20: fleckenstein-5-eth2
+        21: fleckenstein-6-eth0
+#       22: fleckenstein-6-eth1
+        23: fleckenstein-6-eth2
+        24: fleckenstein-7-eth0
+#       25: fleckenstein-7-eth1
+        26: fleckenstein-7-eth2
+        27: fleckenstein-8-eth0
+#       28: fleckenstein-8-eth1
+        29: fleckenstein-8-eth2
+        30: fleckenstein-9-eth0
+#       31: fleckenstein-9-eth1
+        32: fleckenstein-9-eth2
+        33: fleckenstein-10-eth0
+#       34: fleckenstein-10-eth1
+        35: fleckenstein-10-eth2
+        36: 
+          uid: sw-admin
+          kind: switch
+#       40: ramstein-1
+        44: 
+        48: 
+        52: 
+        56: 
+        60: 
+        64: 
+        68: 
+        72: 
+        76: 
+        80: 
+        84: 
+        88:
+        92: 
+        96: 
+        100: 
+        104: 
+        108: 
+        112: 
+        116:
+        120: 
+        124: 
+
+  channels:
+    port-channel1:
+      port: port-channel1
+      uid: srv-data
+      rate: 50000000000
+      kind: server
+
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 6a66cca1af51b2073966babb5b40c9450635e66a..b8fd058e387ece539efc70ca8524908503fa5a1d 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -133,6 +133,11 @@ ecotype:
   eno2: eth1
   eno3: eth2
   eno4: eth3
+engelbourg:
+  enp2s0: eth0
+  enp4s0f0: eth1
+  enp4s0f1: eth2
+  enx020000000002: eth3
 fleckenstein:
   ens10f0: eth0
   ens10f1: eth1